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 0fcd874..049e8f8 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 @@ -451,8 +451,10 @@ public class UsersController extends BaseController { int rog = NumberUtils.toInt(orgId); for (Integer roleMaps : userRoleMapses) { Roles roles1 = rolesService.getRoles(roleMaps); - if (roles1 != null && StringUtils.isNotEmpty(orgId) && roles1.getOrgId() == rog) { - roles.add(roles1); + if (roles1 != null && StringUtils.isNotEmpty(orgId)) { + if(roles1.getOrgId() == null||roles1.getOrgId() == rog){ + roles.add(roles1); + } } } List local = permissions2Service.queryPermissionByRoleIds(userRoleMapses);