Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QA
holmes
Commits
691a2649
Commit
691a2649
authored
Jul 03, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
获取角色列表接口修改
parent
e65f3e37
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
RoleController.java
...ain/java/cn/qg/holmes/controller/auth/RoleController.java
+3
-3
No files found.
src/main/java/cn/qg/holmes/controller/auth/RoleController.java
View file @
691a2649
...
@@ -54,21 +54,21 @@ public class RoleController {
...
@@ -54,21 +54,21 @@ public class RoleController {
List
<
UserRole
>
userRoleList
=
userRoleService
.
list
(
userRoleQueryWrapper
);
List
<
UserRole
>
userRoleList
=
userRoleService
.
list
(
userRoleQueryWrapper
);
List
<
RolePermission
>
rolePermissionList
=
rolePermissionService
.
list
(
rolePermissionQueryWrapper
);
List
<
RolePermission
>
rolePermissionList
=
rolePermissionService
.
list
(
rolePermissionQueryWrapper
);
List
<
String
>
usernameList
=
new
ArrayList
<>();
List
<
String
>
usernameList
=
new
ArrayList
<>();
List
<
String
>
permissionName
List
=
new
ArrayList
<>();
List
<
Integer
>
permissionId
List
=
new
ArrayList
<>();
for
(
UserRole
userRole:
userRoleList
)
{
for
(
UserRole
userRole:
userRoleList
)
{
User
user
=
userService
.
getById
(
userRole
.
getUserId
());
User
user
=
userService
.
getById
(
userRole
.
getUserId
());
usernameList
.
add
(
user
.
getUsername
());
usernameList
.
add
(
user
.
getUsername
());
}
}
for
(
RolePermission
rolePermission:
rolePermissionList
)
{
for
(
RolePermission
rolePermission:
rolePermissionList
)
{
Permission
permission
=
permissionService
.
getById
(
rolePermission
.
getPermissionId
());
Permission
permission
=
permissionService
.
getById
(
rolePermission
.
getPermissionId
());
permission
NameList
.
add
(
permission
.
getPermissionName
());
permission
IdList
.
add
(
permission
.
getId
());
}
}
userRoleQueryWrapper
.
clear
();
userRoleQueryWrapper
.
clear
();
rolePermissionQueryWrapper
.
clear
();
rolePermissionQueryWrapper
.
clear
();
roleInfoMap
.
put
(
"roleId"
,
role
.
getId
());
roleInfoMap
.
put
(
"roleId"
,
role
.
getId
());
roleInfoMap
.
put
(
"roleName"
,
role
.
getRoleName
());
roleInfoMap
.
put
(
"roleName"
,
role
.
getRoleName
());
roleInfoMap
.
put
(
"usernameList"
,
usernameList
);
roleInfoMap
.
put
(
"usernameList"
,
usernameList
);
roleInfoMap
.
put
(
"permission
NameList"
,
permissionName
List
);
roleInfoMap
.
put
(
"permission
IdList"
,
permissionId
List
);
roleTotalInfoList
.
add
(
roleInfoMap
);
roleTotalInfoList
.
add
(
roleInfoMap
);
}
}
map
.
put
(
"total"
,
page
.
getTotal
());
map
.
put
(
"total"
,
page
.
getTotal
());
...
...
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