From d9833f344f3f3c02086e5463d4a5e738361df83f Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 6 May 2016 13:06:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/OrganizationController.java     | 35 ++++++++++------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
index a80d94b..1f819d5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
@@ -11,6 +11,7 @@ import com.lyms.platform.common.enums.OrganizationTypeEnum;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.ResultUtils;
 import com.lyms.platform.common.utils.SystemConfig;
+import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.result.FrontEndResult;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
@@ -46,6 +47,8 @@ public class OrganizationController extends BaseController {
     private AutoMatchFacade autoMatchFacade;
     @Autowired
     private UserOrganizationMapsService userOrganizationMapsService;
+    @Autowired
+    private AccessPermissionFacade accessPermissionFacade;
 
 
     /**
@@ -211,6 +214,7 @@ public class OrganizationController extends BaseController {
 
         String areaId = autoMatchFacade.match(loginState.getId());
         List<Map> data = new ArrayList<>();
+        List<Organization> organizations;
         if (StringUtils.isNotEmpty(areaId)) {
             OrganizationQuery organizationQuery = new OrganizationQuery();
             organizationQuery.setAreaId(areaId);
@@ -219,30 +223,21 @@ public class OrganizationController extends BaseController {
             list.add(4);
             organizationQuery.setYn(YnEnums.YES.getId());
             organizationQuery.setTypeList(list);
-            List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
-            if (CollectionUtils.isNotEmpty(organizations)) {
-                for (Organization organization : organizations) {
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("id", organization.getId());
-                    map.put("name", organization.getName());
-                    data.add(map);
-                }
-            }
+            organizations  = organizationService.queryOrganization(organizationQuery);
+
         } else {
             UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
             userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
             userOrganizationMapsQuery.setUserId(loginState.getId());
-            List<UserOrganizationMaps> userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery);
-            if (CollectionUtils.isNotEmpty(userOrganizationMapsList)) {
-                for (UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) {
-                    if (null != userOrganizationMaps.getOrgId()) {
-                        Organization organization = organizationService.getOrganization(userOrganizationMaps.getOrgId());
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("id", organization.getId());
-                        map.put("name", organization.getName());
-                        data.add(map);
-                    }
-                }
+            organizations =    accessPermissionFacade.findAccessPerminssionByUserId(loginState.getId());
+
+        }
+        if (CollectionUtils.isNotEmpty(organizations)) {
+            for (Organization organization : organizations) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", organization.getId());
+                map.put("name", organization.getName());
+                data.add(map);
             }
         }
         return new FrontEndResult().setData(data).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
-- 
1.8.3.1