From 5f729910ec8f1d8cb54827e6906aeb3192b6c654 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 30 Mar 2017 14:57:48 +0800
Subject: [PATCH] a

---
 .../com/lyms/platform/operate/web/controller/RolesController.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
index 70bacea..bfc918a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
@@ -506,7 +506,7 @@ public class RolesController extends BaseController {
             if (users.getType() == 2) {
                 rolesList.addAll(roles);
             } else {
-                UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
+                /*UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
                 userRoleMapsQuery.setYn(YnEnums.YES.getId());
                 userRoleMapsQuery.setUserId(users.getId());
                 List<UserRoleMaps> userRoleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery);
@@ -518,7 +518,8 @@ public class RolesController extends BaseController {
                     if (onwerRoleIds.contains(roles1.getId())) {
                         rolesList.add(roles1);
                     }
-                }
+                }*/
+                rolesList.addAll(roles);
             }
 
             List<Permissions2> permissionses;
-- 
1.8.3.1