Commit e9a9f1becdd5adff129624de77eec3487a9eddcc
1 parent
0d93db8cb7
Exists in
master
and in
8 other branches
platform permission
权限去重
Showing 1 changed file with 4 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
e9a9f1b
... | ... | @@ -258,6 +258,7 @@ |
258 | 258 | List<Roles> roles = new ArrayList<>(); |
259 | 259 | List<Permissions> permissions = null; |
260 | 260 | RolePermissionMapsQuery rolePermissionMapsQuery ; |
261 | + List<Integer> permissionIds = new ArrayList<>(); | |
261 | 262 | for(Integer roleMaps : userRoleMapses) { |
262 | 263 | roles.add(rolesService.getRoles(roleMaps)); |
263 | 264 | |
264 | 265 | |
265 | 266 | |
... | ... | @@ -266,14 +267,16 @@ |
266 | 267 | rolePermissionMapsQuery.setRoleId(roleMaps); |
267 | 268 | rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); |
268 | 269 | List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); |
270 | + | |
269 | 271 | for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) { |
270 | 272 | Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId()); |
271 | 273 | if(null != permissions1) { |
272 | 274 | if(null == permissions) { |
273 | 275 | permissions = new ArrayList<>(); |
274 | 276 | } |
275 | - if(!permissions.contains(permissions1)) { | |
277 | + if(!permissionIds.contains(permissions1.getId())) { | |
276 | 278 | permissions.add(permissions1); |
279 | + permissionIds.add(permissions1.getId()); | |
277 | 280 | } |
278 | 281 | } |
279 | 282 | } |