From 730896ecf9ec85ff1b904813c5d9cf3859a88cf6 Mon Sep 17 00:00:00 2001
From: hanshaofeng <hanshaofeng@lymsh.com>
Date: Fri, 2 Dec 2016 16:03:32 +0800
Subject: [PATCH] add extends BaseModel

---
 .../operate/web/controller/UsersController.java    | 28 ++++++++++------------
 1 file changed, 12 insertions(+), 16 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 51cece3..33c37b1 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
@@ -474,32 +474,28 @@ public class UsersController extends BaseController {
             }
         }
 
-
+        List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(users.getId());
+        if (permissionsModelList != null && permissionsModelList.size() > 0) {
+            users.setAreaPermission(permissionsModelList.get(0).getAreaPermission());
+        }
         List<Organization> organizations = new ArrayList<>();
-        if(null != users.getOrgId() && UserTypeEnum.NORMAL_USER.getId().equals(users.getType())) {  //普通用户
+        if (UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())) {//超级管理员
+            OrganizationQuery organizationQuery = new OrganizationQuery();
+            organizationQuery.setYn(YnEnums.YES.getId());
+            organizations = organizationService.queryOrganization(organizationQuery);
+        } else {
             Organization organization = organizationService.getOrganization(users.getOrgId());
             organizations.add(organization);
             users.setOrganization(organization);
-        } else if (UserTypeEnum.PLATFORM_ADMIN.getId().equals(users.getType())) {  //管理员
-            List<Organization> list2  = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(users.getId()));
+            List<Organization> list2  = accessPermissionFacade.getOrganization(permissionsModelList);
             if(CollectionUtils.isNotEmpty(list2)){
-                for(Organization organization:list2){
-                    organizations.add(organization);
+                for(Organization o:list2){
+                    organizations.add(o);
                 }
             }
-        } else if (UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())) {//超级管理员
-            OrganizationQuery organizationQuery = new OrganizationQuery();
-            organizationQuery.setYn(YnEnums.YES.getId());
-            organizations = organizationService.queryOrganization(organizationQuery);
         }
-
         users.setOrganizations(organizations);
 
-        List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(users.getId());
-        if (permissionsModelList != null && permissionsModelList.size() > 0) {
-            users.setAreaPermission(permissionsModelList.get(0).getAreaPermission());
-        }
-
         Map<String, Object> map = new HashMap<>();
         map.put("user", users);
         map.put("roles", roles);
-- 
1.8.3.1