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 fb2dcd1..06d423d 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 @@ -258,6 +258,7 @@ public class UsersController extends BaseController { List roles = new ArrayList<>(); List permissions = null; RolePermissionMapsQuery rolePermissionMapsQuery ; + List permissionIds = new ArrayList<>(); for(Integer roleMaps : userRoleMapses) { roles.add(rolesService.getRoles(roleMaps)); @@ -266,14 +267,16 @@ public class UsersController extends BaseController { rolePermissionMapsQuery.setRoleId(roleMaps); rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); List rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); + for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) { Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId()); if(null != permissions1) { if(null == permissions) { permissions = new ArrayList<>(); } - if(!permissions.contains(permissions1)) { + if(!permissionIds.contains(permissions1.getId())) { permissions.add(permissions1); + permissionIds.add(permissions1.getId()); } } }