Commit 691a2649 authored by 黎博's avatar 黎博

获取角色列表接口修改

parent e65f3e37
...@@ -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> permissionNameList = new ArrayList<>(); List<Integer> permissionIdList = 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());
permissionNameList.add(permission.getPermissionName()); permissionIdList.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("permissionNameList", permissionNameList); roleInfoMap.put("permissionIdList", permissionIdList);
roleTotalInfoList.add(roleInfoMap); roleTotalInfoList.add(roleInfoMap);
} }
map.put("total", page.getTotal()); map.put("total", page.getTotal());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment