Commit 8daf33a859f224eb2daf7a0d6123703ee749034f
1 parent
f0eff90703
Exists in
master
and in
8 other branches
修改产检删除
Showing 1 changed file with 4 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
8daf33a
| ... | ... | @@ -451,8 +451,10 @@ |
| 451 | 451 | int rog = NumberUtils.toInt(orgId); |
| 452 | 452 | for (Integer roleMaps : userRoleMapses) { |
| 453 | 453 | Roles roles1 = rolesService.getRoles(roleMaps); |
| 454 | - if (roles1 != null && StringUtils.isNotEmpty(orgId) && roles1.getOrgId() == rog) { | |
| 455 | - roles.add(roles1); | |
| 454 | + if (roles1 != null && StringUtils.isNotEmpty(orgId)) { | |
| 455 | + if(roles1.getOrgId() == null||roles1.getOrgId() == rog){ | |
| 456 | + roles.add(roles1); | |
| 457 | + } | |
| 456 | 458 | } |
| 457 | 459 | } |
| 458 | 460 | List<Permissions2> local = permissions2Service.queryPermissionByRoleIds(userRoleMapses); |