From 8bffffda7cef8459a14b2c470ff4ffef555f2da9 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 25 Nov 2016 10:29:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E8=AF=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/AutoMatchFacade.java   | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
index ab1036e..8d4fe09 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
@@ -58,7 +58,7 @@ public class AutoMatchFacade {
         List<Integer>  data = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
             data.add(list.get(0).getOrgId());
-            //用户角色
+           /* //用户角色
             if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType())) {
                 List<Organization> list2  = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId()));
                 if(CollectionUtils.isNotEmpty(list2)){
@@ -66,27 +66,19 @@ public class AutoMatchFacade {
                         data.add(organization.getId());
                     }
                 }
-            }  else if(UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())){
+            }else if(UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())){
                 List<Organization> list2  = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId()));
                 if(CollectionUtils.isNotEmpty(list2)){
                     for(Organization organization:list2){
                         data.add(organization.getId());
                     }
                 }
-                /*UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
-                userOrganizationMapsQuery.setUserId(list.get(0).getId());
-                userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
-                List<UserOrganizationMaps>  list1  =    userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery);
-                if(CollectionUtils.isNotEmpty(list1)){
-                    for(UserOrganizationMaps userOrganizationMaps:list1){
-                        data.add(userOrganizationMaps.getOrgId());
-                    }
-                }*/
             }  else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(list.get(0).getType())) {
                 return  null;
-            }
+            }*/
+            return data;
         }
-        return data;
+       return null;
     }
     public String getHospitalId(Integer userId){
         List<Integer> list =  matchOrgId(userId);
-- 
1.8.3.1