From 8daf33a859f224eb2daf7a0d6123703ee749034f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 16 Dec 2016 14:41:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/controller/UsersController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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); -- 1.8.3.1