From 839eb5403e4fecd676d9618f95826a8ade7307e5 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 7 Apr 2022 17:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E7=96=AB=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/EpidemicPreventionFormDTO.java    | 1 +
 .../com/epmet/controller/IcEpidemicPreventionController.java  | 1 +
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java    | 4 ++++
 .../src/main/resources/mapper/IcResiUserDao.xml               | 1 +
 4 files changed, 7 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java
index 83d22c6a13..345d7496b0 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java
@@ -28,6 +28,7 @@ public class EpidemicPreventionFormDTO extends PageFormDTO implements Serializab
      * 网格ID
      */
     private String gridId;
+    private String staffId;
     /**
      * 小区ID
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java
index de3612756d..507aea1a65 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java
@@ -60,6 +60,7 @@ public class IcEpidemicPreventionController{
     @PostMapping("page")
     public Result<PageData<EpidemicPreventionResultDTO>> search(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         PageData<EpidemicPreventionResultDTO> result = icResiUserService.epidemicPreventionList(formDTO);
         return new Result<PageData<EpidemicPreventionResultDTO>>().ok(result);
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 57547b226e..c5f39ab387 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -1250,6 +1250,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      */
     @Override
     public PageData<EpidemicPreventionResultDTO> epidemicPreventionList(EpidemicPreventionFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null != staffInfo) {
+            formDTO.setAgencyId(staffInfo.getAgencyId());
+        }
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<EpidemicPreventionResultDTO> list = baseDao.getEpidemicPreventionList(formDTO);
         PageInfo<EpidemicPreventionResultDTO> pageInfo = new PageInfo<>(list);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index a38f1ae5df..416d423a37 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -680,6 +680,7 @@
                 GROUP BY ID_CARD ) c ON a.ID_CARD = c.ID_CARD
         WHERE
             a.DEL_FLAG = '0'
+            AND a.`STATUS` = '0'
             <if test="customerId != null and customerId != ''">
             AND a.CUSTOMER_ID = #{customerId}
             </if>