Commit b8881b6eab49fce781e88595e485a7cf9331f705
1 parent
8ce3e4ec4f
Exists in
master
and in
1 other branch
增加
Showing 1 changed file with 12 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
b8881b6
| ... | ... | @@ -321,11 +321,12 @@ |
| 321 | 321 | List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query); |
| 322 | 322 | RolePermissionMapsQuery rolePermissionMapsQuery ; |
| 323 | 323 | List<Integer> permissionIds = new ArrayList<>(); |
| 324 | + permissions = new ArrayList<>(); | |
| 324 | 325 | for(Integer roleMaps : userRoleMapses) { |
| 325 | 326 | roles.add(rolesService.getRoles(roleMaps)); |
| 326 | 327 | |
| 327 | 328 | //获取角色权限信息 |
| 328 | - rolePermissionMapsQuery = new RolePermissionMapsQuery(); | |
| 329 | + /* rolePermissionMapsQuery = new RolePermissionMapsQuery(); | |
| 329 | 330 | rolePermissionMapsQuery.setRoleId(roleMaps); |
| 330 | 331 | rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); |
| 331 | 332 | List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); |
| ... | ... | @@ -339,6 +340,16 @@ |
| 339 | 340 | if(!permissionIds.contains(permissions1.getId())) { |
| 340 | 341 | permissions.add(permissions1); |
| 341 | 342 | permissionIds.add(permissions1.getId()); |
| 343 | + } | |
| 344 | + } | |
| 345 | + }*/ | |
| 346 | + | |
| 347 | + List<Permissions> local = permissionsService.queryPermissionByRoleIds(roleMaps); | |
| 348 | + if(CollectionUtils.isNotEmpty(local)){ | |
| 349 | + for(Permissions permissions1:local){ | |
| 350 | + if(!permissionIds.contains(permissions1.getId())) { | |
| 351 | + permissionIds.add(permissions1.getId()); | |
| 352 | + permissions.add(permissions1); | |
| 342 | 353 | } |
| 343 | 354 | } |
| 344 | 355 | } |