Commit 65611ff7f5b0d20971b41a6b931fea526bcbafa8
1 parent
165588acbf
Exists in
master
and in
1 other branch
platform permission
fix bug
Showing 1 changed file with 19 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
65611ff
| ... | ... | @@ -45,8 +45,11 @@ |
| 45 | 45 | private String token; |
| 46 | 46 | @Value("#{configProperties['login.typeId']}") |
| 47 | 47 | private String typeId; |
| 48 | + @Autowired | |
| 49 | + private RolePermissionMapsService rolePermissionMapsService; | |
| 50 | + @Autowired | |
| 51 | + private PermissionsService permissionsService; | |
| 48 | 52 | |
| 49 | - | |
| 50 | 53 | private static final String LYMS = "龙源美生"; |
| 51 | 54 | |
| 52 | 55 | |
| 53 | 56 | |
| 54 | 57 | |
| 55 | 58 | |
| 56 | 59 | |
| ... | ... | @@ -192,17 +195,32 @@ |
| 192 | 195 | users = usersService.getUsers(loginContext.getId()); |
| 193 | 196 | } |
| 194 | 197 | |
| 198 | + //获取用户角色信息 | |
| 195 | 199 | UserRoleMapsQuery query = new UserRoleMapsQuery(); |
| 196 | 200 | query.setUserId(users.getId()); |
| 197 | 201 | query.setYn(YnEnums.YES.getId()); |
| 198 | 202 | List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query); |
| 199 | 203 | List<Roles> roles = new ArrayList<>(); |
| 204 | + List<Permissions> permissions = new ArrayList<>(); | |
| 205 | + RolePermissionMapsQuery rolePermissionMapsQuery ; | |
| 200 | 206 | for(UserRoleMaps roleMaps : userRoleMapses) { |
| 201 | 207 | roles.add(rolesService.getRoles(roleMaps.getRoleId())); |
| 208 | + | |
| 209 | + //获取角色权限信息 | |
| 210 | + rolePermissionMapsQuery = new RolePermissionMapsQuery(); | |
| 211 | + rolePermissionMapsQuery.setRoleId(roleMaps.getRoleId()); | |
| 212 | + rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); | |
| 213 | + List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); | |
| 214 | + for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) { | |
| 215 | + permissions.add(permissionsService.getPermissions(rolePermissionMaps.getPermissionId())); | |
| 216 | + } | |
| 202 | 217 | } |
| 218 | + | |
| 219 | + | |
| 203 | 220 | Map<String, Object> map = new HashMap<>(); |
| 204 | 221 | map.put("user", users); |
| 205 | 222 | map.put("roles", roles); |
| 223 | + map.put("permissions", permissions); | |
| 206 | 224 | |
| 207 | 225 | ResultUtils.buildSuccessResultAndWrite(response, map); |
| 208 | 226 | } |