Commit c67af7113222bb5944b34ccde6e7ce74b048742c
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
View file @
c67af71
| ... | ... | @@ -330,6 +330,24 @@ |
| 330 | 330 | rolesQuery.setLimit(limit); |
| 331 | 331 | |
| 332 | 332 | List<Roles> roles = rolesService.queryRoles(rolesQuery); |
| 333 | + List<Permissions> permissionses = null; | |
| 334 | + for(Roles roles1 : roles) { | |
| 335 | + permissionses = new ArrayList<>(); | |
| 336 | + RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); | |
| 337 | + rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); | |
| 338 | + rolePermissionMapsQuery.setRoleId(roles1.getId()); | |
| 339 | + List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); | |
| 340 | + | |
| 341 | + for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) { | |
| 342 | + Permissions permissions = permissionsService.getPermissions(rolePermissionMaps.getPermissionId()); | |
| 343 | + if(permissions.getYn().equals(YnEnums.NO.getId())) continue; | |
| 344 | + permissionses.add(permissions); | |
| 345 | + } | |
| 346 | + | |
| 347 | + roles1.setPermissions(permissionses); | |
| 348 | + } | |
| 349 | + | |
| 350 | + | |
| 333 | 351 | |
| 334 | 352 | FrontEndResult frontEndResult = new FrontEndResult(); |
| 335 | 353 | frontEndResult.setPageInfo(rolesQuery.getPageInfo()); |