From ff4a79742cdbf3017c1b0a09463000de5be200d0 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 9 Jun 2022 09:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=8B=86=E5=88=86=E4=B8=A4?=
 =?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-client-yushan                                     | 2 +-
 epdc-cloud-commons-yushan                                    | 2 +-
 .../epidemic/service/impl/EpidemicUserInfoServiceImpl.java   | 5 +++++
 .../main/resources/mapper/epidemic/EpidemicUserInfoDao.xml   | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index df55714..f79cc57 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit df557141415794417f4b09250c10d73b5d0c4d8c
+Subproject commit f79cc57f17df4a5a287b0b3f1907d7d7fa871f63
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index fa05d3f..640458a 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit fa05d3fcdfa92d51c9c3f5b4746748d29ad168c4
+Subproject commit 640458ab1be4f3e24a7c8e365c04f753bef6614e
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index f38b81d..1e6c3fc 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -115,11 +115,16 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     public PageData<EpidemicRecordListDTO> getPageList(Map<String, Object> params) {
         IPage<EpidemicRecordListDTO> page = getPage(params);
         String grids = (String) params.get("deptIdList");
+        String agencyList = (String) params.get("agencyList");
         params.put("deptIdList",null);
         if(StringUtils.isNotBlank(grids)){
             List<String> gridList = Arrays.asList(grids.split(","));
             params.put("gridList",gridList);
         }
+        if(StringUtils.isNotBlank(agencyList)){
+            List<String> agencyIdList = Arrays.asList(agencyList.split(","));
+            params.put("agencyList",agencyIdList);
+        }
         UserDetail user = SecurityUser.getUser();
         if (user == null) {
             throw new RenException("用户未登录");
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
index a02a8bb..cb1cd7f 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
@@ -143,6 +143,11 @@
                 #{id}
             </foreach>
         </if>
+        <if test="agencyList != null and agencyList.size() > 0">
+            <foreach collection="agencyList" item="agency" open="AND (" close=")" separator="or" >
+                find_in_set(#{agency},ui.ALL_DEPT_IDS)
+            </foreach>
+        </if>
         <if test="gridList != null and gridList.size() > 0">
             and ui.dept_id in
             <foreach item="id" collection="gridList" open="(" separator="," close=")">