From 7993a4fbcc4957e9ab830241d3a5b550b61e7ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 7 Jun 2022 14:09:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?=
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 +-
 .../service/impl/EpidemicUserInfoExportServer.java     | 10 ++++++++++
 .../service/impl/EpidemicUserInfoServiceImpl.java      |  7 ++++++-
 .../resources/mapper/epidemic/EpidemicUserInfoDao.xml  |  6 ++++++
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index f79cc57..df55714 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit f79cc57f17df4a5a287b0b3f1907d7d7fa871f63
+Subproject commit df557141415794417f4b09250c10d73b5d0c4d8c
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 640458a..fa05d3f 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 640458ab1be4f3e24a7c8e365c04f753bef6614e
+Subproject commit fa05d3fcdfa92d51c9c3f5b4746748d29ad168c4
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 8d8ce27..56f91e2 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
@@ -10,11 +10,13 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao;
 import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO;
 import com.elink.esua.epdc.vaccine.epidemic.excel.EpidecmicUserNewExcel;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -35,6 +37,14 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer {
         Map<String, Object> params = (Map<String, Object>) queryParams;
         params.put("excelBigDataPageSize", 30000);
         params.put("excelBigDataPageIndex", (page - 1) * 30000);
+
+        String grids = (String) params.get("deptIdList");
+        params.put("deptIdList",null);
+        if(StringUtils.isNotBlank(grids)){
+            List<String> gridList = Arrays.asList(grids.split(","));
+            params.put("gridList",gridList);
+        }
+
         UserDetail user = SecurityUser.getUser();
         if (user == null) {
             throw new RenException("用户未登录");
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 c37689f..f38b81d 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
@@ -114,7 +114,12 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Override
     public PageData<EpidemicRecordListDTO> getPageList(Map<String, Object> params) {
         IPage<EpidemicRecordListDTO> page = getPage(params);
-
+        String grids = (String) params.get("deptIdList");
+        params.put("deptIdList",null);
+        if(StringUtils.isNotBlank(grids)){
+            List<String> gridList = Arrays.asList(grids.split(","));
+            params.put("gridList",gridList);
+        }
         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 18ecdc5..a02a8bb 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,12 @@
                 #{id}
             </foreach>
         </if>
+        <if test="gridList != null and gridList.size() > 0">
+            and ui.dept_id in
+            <foreach item="id" collection="gridList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
         <if test="nativePlace != null and nativePlace != ''">
             and ui.NATIVE_PLACE like '%${nativePlace}%'
         </if>