diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index 6fde429..b8e742d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -330,6 +330,24 @@ public class RolesController extends BaseController { rolesQuery.setLimit(limit); List roles = rolesService.queryRoles(rolesQuery); + List permissionses = null; + for(Roles roles1 : roles) { + permissionses = new ArrayList<>(); + RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); + rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); + rolePermissionMapsQuery.setRoleId(roles1.getId()); + List rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); + + for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) { + Permissions permissions = permissionsService.getPermissions(rolePermissionMaps.getPermissionId()); + if(permissions.getYn().equals(YnEnums.NO.getId())) continue; + permissionses.add(permissions); + } + + roles1.setPermissions(permissionses); + } + + FrontEndResult frontEndResult = new FrontEndResult(); frontEndResult.setPageInfo(rolesQuery.getPageInfo());