From c0a5eafb542f846b86761ac9190c861d39495e13 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 5 May 2016 17:52:53 +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

---
 .../com/lyms/platform/permission/model/DepartmentsQuery.java | 10 ++++++++++
 .../java/com/lyms/platform/permission/model/UsersQuery.java  |  2 +-
 .../src/main/resources/mainOrm/Departments.xml               |  6 ++++++
 .../operate/web/controller/DepartmentsController.java        |  4 ++--
 .../lyms/platform/operate/web/facade/AutoMatchFacade.java    | 12 +++++++++---
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/DepartmentsQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/DepartmentsQuery.java
index 5d03428..b931485 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/DepartmentsQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/DepartmentsQuery.java
@@ -4,6 +4,7 @@ package com.lyms.platform.permission.model;
 import com.lyms.platform.common.dao.BaseQuery;
 
 import java.util.Date;
+import java.util.List;
 
 
 public class DepartmentsQuery extends BaseQuery {
@@ -21,6 +22,15 @@ public class DepartmentsQuery extends BaseQuery {
     private String shortCode;
     private String keyword;
     private String foreignId;
+    private List<Integer> orgList;
+
+    public List<Integer> getOrgList() {
+        return orgList;
+    }
+
+    public void setOrgList(List<Integer> orgList) {
+        this.orgList = orgList;
+    }
 
     public String getForeignId() {
         return foreignId;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
index f8e43a8..810a599 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
@@ -29,7 +29,7 @@ public class UsersQuery extends BaseQuery {
     private String keyword;
     private Integer roleId;
     private String foreignId;
-    private Integer otherAccount;   //第三方帐号, 1医院帐号
+    private Integer otherAccount;
 
     public Integer getOtherAccount() {
         return otherAccount;
diff --git a/platform-biz-service/src/main/resources/mainOrm/Departments.xml b/platform-biz-service/src/main/resources/mainOrm/Departments.xml
index d1d2abb..68d5b1e 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Departments.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Departments.xml
@@ -135,6 +135,12 @@ select id,parent_id,name,org_id,description,publish_id,publish_name,yn,modified,
             <if test="keyword != null and keyword != ''">
                 and name like CONCAT(#{keyword}, '%')
             </if>
+            <if test="orgList != null">
+                and org_id in
+                <foreach collection="orgList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </sql>
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
index 487f6d2..7e9de8a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
@@ -181,11 +181,11 @@ public class DepartmentsController extends   BaseController {
         departmentsQuery.setNeed("true");
         departmentsQuery.setSort("id desc");
         departmentsQuery.setYn(YnEnums.YES.getId());
-        Integer orgId1 = autoMatchFacade.matchOrgId(loginState.getId());
+        List<Integer> orgId1 = autoMatchFacade.matchOrgId(loginState.getId());
         if(null!=orgId){
             departmentsQuery.setOrgId(orgId);
         }else{
-            departmentsQuery.setOrgId(orgId1);
+            departmentsQuery.setOrgList(orgId1);
         }
 
         departmentsQuery.setPage(page);
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 163fa7d..f4f34e2 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
@@ -16,6 +16,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -48,17 +49,22 @@ public class AutoMatchFacade {
         return null;
     }
 
-    public Integer matchOrgId(int userId){
+    public List<Integer> matchOrgId(int userId){
         UsersQuery usersQuery = new UsersQuery();
         usersQuery.setId(userId);
 
         usersQuery.setYn(1);
         List<Users> list = usersService.queryUsers(usersQuery);
+        List<Integer>  data = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
             //鐢ㄦ埛瑙掕壊
             if (list.get(0).getType() == 1) {
-                Organization organization = organizationService.getOrganization(list.get(0).getOrgId());
-                return organization.getId();
+                for(Users users:list){
+                    if(null!=users.getOrgId()){
+                        data.add(users.getOrgId());
+                    }
+                }
+                return data;
             }
         }
         return null;
-- 
1.8.3.1