Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
445c0771
Commit
445c0771
authored
Jun 28, 2019
by
fengshuonan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复用户详情,部门显示的问题
parent
bd3c3d42
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
guns-sys/src/main/java/cn/stylefeng/guns/sys/core/constant/factory/ConstantFactory.java
+2
-2
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/service/UserService.java
+2
-2
No files found.
guns-sys/src/main/java/cn/stylefeng/guns/sys/core/constant/factory/ConstantFactory.java
View file @
445c0771
...
...
@@ -343,11 +343,11 @@ public class ConstantFactory implements IConstantFactory {
if
(
userPosList
!=
null
&&
userPosList
.
size
()
>
0
)
{
for
(
UserPos
userPos
:
userPosList
)
{
Position
position
=
positionService
.
getById
(
userPos
.
getPosId
());
positionNames
.
append
(
position
.
getName
());
positionNames
.
append
(
","
).
append
(
position
.
getName
());
}
}
return
positionNames
.
toString
(
);
return
StrUtil
.
removePrefix
(
positionNames
.
toString
(),
","
);
}
...
...
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/service/UserService.java
View file @
445c0771
...
...
@@ -254,12 +254,12 @@ public class UserService extends ServiceImpl<UserMapper, User> {
User
user
=
this
.
getById
(
userId
);
Map
<
String
,
Object
>
map
=
UserFactory
.
removeUnSafeFields
(
user
);
HashMap
<
Object
,
Object
>
hashMap
=
CollectionUtil
.
newHashMap
();
HashMap
<
String
,
Object
>
hashMap
=
CollectionUtil
.
newHashMap
();
hashMap
.
putAll
(
map
);
hashMap
.
put
(
"roleName"
,
ConstantFactory
.
me
().
getRoleName
(
user
.
getRoleId
()));
hashMap
.
put
(
"deptName"
,
ConstantFactory
.
me
().
getDeptName
(
user
.
getDeptId
()));
return
m
ap
;
return
hashM
ap
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment