From e9a9f1becdd5adff129624de77eec3487a9eddcc Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Tue, 3 May 2016 10:23:48 +0800 Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/controller/UsersController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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()); } } } -- 1.8.3.1