From 6183c74071920e6dfd65a28854e01f7799310a84 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 1 Jul 2022 10:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/service/impl/EpidemicUserInfoExportServer.java   | 3 ++-
 .../epidemic/service/impl/EpidemicUserInfoServiceImpl.java    | 2 +-
 .../main/resources/mapper/epidemic/EpidemicUserInfoDao.xml    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java
index 6f40eaf..330823b 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java
@@ -41,13 +41,14 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer {
         String grids = (String) params.get("deptIdList");
         String agencyList = (String) params.get("agencyList");
         params.put("deptIdList",null);
+        params.put("agencyList",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);
+            params.put("agencyIdList",agencyIdList);
         }
         UserDetail user = SecurityUser.getUser();
         if (user == null) {
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 fdd80ec..3789758 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
@@ -144,7 +144,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         }
         if (StringUtils.isNotBlank(agencyList)) {
             List<String> agencyIdList = Arrays.asList(agencyList.split(","));
-            params.put("agencyList", agencyIdList);
+            params.put("agencyIdList", agencyIdList);
         } else {
             params.put("agencyList", null);
         }
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 a248e52..1e7adce 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,8 +143,8 @@
                 #{id}
             </foreach>
         </if>
-        <if test="agencyList != null and agencyList.size() > 0">
-            <foreach collection="agencyList" item="agency" open="AND (" close=")" separator="or" >
+        <if test="agencyIdList != null and agencyIdList.size() > 0">
+            <foreach collection="agencyIdList" item="agency" open="AND (" close=")" separator="or" >
                 find_in_set(#{agency},ui.ALL_DEPT_IDS)
             </foreach>
         </if>