Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit c2a23327
authored
Nov 24, 2023
by
huangjinxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:用户信息返回设置
1 parent
a5df19af
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
project-interface/src/main/java/com/dituhui/pea/pojo/UserLoginDTO.java
project-user/src/main/java/com/dituhui/pea/user/service/UserService.java
project-interface/src/main/java/com/dituhui/pea/pojo/UserLoginDTO.java
View file @
c2a2332
...
@@ -2,6 +2,7 @@ package com.dituhui.pea.pojo;
...
@@ -2,6 +2,7 @@ package com.dituhui.pea.pojo;
import
java.util.List
;
import
java.util.List
;
import
com.dituhui.pea.pojo.user.UserMenuSettingInfo
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -26,5 +27,6 @@ public class UserLoginDTO {
...
@@ -26,5 +27,6 @@ public class UserLoginDTO {
private
List
<
RoleInfo
>
roles
;
private
List
<
RoleInfo
>
roles
;
private
List
<
ResourceInfo
>
menus
;
private
List
<
ResourceInfo
>
menus
;
private
List
<
OrganizationDTO
>
auths
;
private
List
<
OrganizationDTO
>
auths
;
private
List
<
UserMenuSettingInfo
>
settings
;
}
}
project-user/src/main/java/com/dituhui/pea/user/service/UserService.java
View file @
c2a2332
...
@@ -216,6 +216,9 @@ public class UserService {
...
@@ -216,6 +216,9 @@ public class UserService {
}
}
}
}
userDTO
.
setAuths
(
allOrgs
);
userDTO
.
setAuths
(
allOrgs
);
// 获取用户配置
userDTO
.
setSettings
(
getSettings
(
userDTO
.
getId
()));
return
userDTO
;
return
userDTO
;
}
}
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment