diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index 34b10d5..8fa5a21 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -321,11 +321,12 @@ public class UsersController extends BaseController { List userRoleMapses = userRoleMapsService.queryUserRoleList(query); RolePermissionMapsQuery rolePermissionMapsQuery ; List permissionIds = new ArrayList<>(); + permissions = new ArrayList<>(); for(Integer roleMaps : userRoleMapses) { roles.add(rolesService.getRoles(roleMaps)); //获取角色权限信息 - rolePermissionMapsQuery = new RolePermissionMapsQuery(); + /* rolePermissionMapsQuery = new RolePermissionMapsQuery(); rolePermissionMapsQuery.setRoleId(roleMaps); rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); List rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); @@ -341,6 +342,16 @@ public class UsersController extends BaseController { permissionIds.add(permissions1.getId()); } } + }*/ + + List local = permissionsService.queryPermissionByRoleIds(roleMaps); + if(CollectionUtils.isNotEmpty(local)){ + for(Permissions permissions1:local){ + if(!permissionIds.contains(permissions1.getId())) { + permissionIds.add(permissions1.getId()); + permissions.add(permissions1); + } + } } } }