From a042cab924c924cf46f512b55f80420d76063a1c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 14 Sep 2022 16:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF-----=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EpidemicBuildingUnitServiceImpl.java     |  3 +++
 .../impl/EpidemicPlotBuildingServiceImpl.java     |  5 +++++
 .../impl/EpidemicPlotCoordinateServiceImpl.java   |  2 ++
 .../mapper/personroom/EpidemicBuildingUnitDao.xml |  6 ++++++
 .../mapper/personroom/EpidemicPlotBuildingDao.xml |  6 ++++++
 .../personroom/EpidemicPlotCoordinateDao.xml      | 15 +++++++++------
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
index 5a9a9f3..fb84d3d 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.constant.StrConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -127,6 +128,8 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
 
     @Override
     public PageData<EpidemicBuildingUnitDTO> page(Map<String, Object> params) {
+        List<Long> deptIdList = SecurityUser.getUser().getDeptIdList();
+        params.put("deptIdList",deptIdList);
         IPage<EpidemicBuildingUnitDTO> page = getPage(params);
         List<EpidemicBuildingUnitDTO> list = baseDao.getUnitPage(params);
         return new PageData<>(list, page.getTotal());
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
index 24e0f61..5f4eea9 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
@@ -30,6 +30,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.dto.AllDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
@@ -95,6 +96,8 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
 
     @Override
     public PageData<EpidemicPlotBuildingDTO> page(Map<String, Object> params) {
+        List<Long> deptIdList = SecurityUser.getUser().getDeptIdList();
+        params.put("deptIdList",deptIdList);
         IPage<EpidemicPlotBuildingDTO> page = getPage(params);
         List<EpidemicPlotBuildingDTO> list = baseDao.getBuildingPage(params);
         return new PageData<>(list, page.getTotal());
@@ -102,6 +105,8 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
 
     @Override
     public List<EpidemicPlotBuildingDTO> list(Map<String, Object> params) {
+        List<Long> deptIdList = SecurityUser.getUser().getDeptIdList();
+        params.put("deptIdList",deptIdList);
         return baseDao.getBuildingPage(params);
     }
 
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java
index 78bbc9f..ba2672e 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java
@@ -96,6 +96,8 @@ public class EpidemicPlotCoordinateServiceImpl extends CrudServiceImpl<EpidemicP
 
     @Override
     public PageData<EpidemicPlotCoordinateDTO> page(Map<String, Object> params) {
+        List<Long> deptIdList = SecurityUser.getUser().getDeptIdList();
+        params.put("deptIdList",deptIdList);
         IPage<EpidemicPlotCoordinateDTO> page = getPage(params);
         List<EpidemicPlotCoordinateDTO> list = baseDao.getPlotPage(params);
         list.forEach(item -> {
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
index ae0fbb6..f2c2677 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
@@ -93,6 +93,12 @@
         <if test="mobile != null and mobile !=''">
             AND o.MOBILE = #{mobile}
         </if>
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            and u.GRID_ID in
+            <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY u.CREATED_TIME DESC
     </select>
 
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml
index c7113bc..3aa056d 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml
@@ -124,6 +124,12 @@
         <if test="buildingCode != null and buildingCode !=''">
             AND b.BUILDING_CODE LIKE '%${buildingCode}%'
         </if>
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            and b.GRID_ID in
+            <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY b.CREATED_TIME DESC
     </select>
     <select id="getMaxIndexByGridId" resultType="java.lang.Integer">
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml
index 8fd927e..22cb03c 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml
@@ -51,8 +51,7 @@
         epidemic_plot_coordinate pc
         LEFT JOIN epidemic_plot_grid g ON g.PLOT_ID = pc.id
         LEFT JOIN esua_epdc_admin.sys_dept d ON d.id = g.GRID_ID
-        WHERE
-        pc.DEL_FLAG = '0'
+        WHERE pc.DEL_FLAG = '0'
         <if test="plotName != null and plotName != ''">
             and pc.PLOT_NAME like CONCAT('%',#{plotName},'%')
         </if>
@@ -65,10 +64,14 @@
         <if test="gridId != null and gridId != ''">
             and g.GRID_ID = #{gridId}
         </if>
-        GROUP BY
-        pc.id
-        ORDER BY
-            CREATED_TIME DESC
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            and g.GRID_ID in
+            <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        GROUP BY pc.id
+        ORDER BY CREATED_TIME DESC
     </select>
 
     <select id="listSimple" resultType="com.elink.esua.epdc.dto.personroom.result.EpidemicPlotCoordinateResultDTO"