From 83aac2dc0ac1110a906bd90b05f53908447001dd Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 3 Nov 2022 10:17:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=98=B2=E7=96=AB=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiUserServiceImpl.java  | 10 ++++++----
 .../src/main/resources/mapper/IcResiUserDao.xml        |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

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 4b7a485d71..e77dc98b27 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
@@ -63,7 +63,6 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO;
 import com.epmet.entity.*;
-import com.epmet.excel.DataSyncRecordDisabilityExcel;
 import com.epmet.excel.EpidemicPreventionExportExcel;
 import com.epmet.excel.support.ExportResiUserItemDTO;
 import com.epmet.feign.*;
@@ -1693,9 +1692,12 @@ 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());
+        if(StringUtils.isBlank(formDTO.getAgencyId())){
+            //没有指定查询某个组织时，默认查询当前用户所属组织及下级
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+            if (null != staffInfo) {
+                formDTO.setAgencyId(staffInfo.getAgencyId());
+            }
         }
         List<EpidemicPreventionResultDTO> list = new ArrayList<>();
         if (formDTO.getIsPage()){
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 497d96a25b..9c48f39c2f 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
@@ -879,13 +879,13 @@
             AND a.CUSTOMER_ID = #{customerId}
             </if>
             <if test="agencyId != null and agencyId != ''">
-            AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
+                AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
             </if>
             <if test="id != null and id != ''">
             AND ID = #{id}
             </if>
             <if test="gridId != null and gridId != ''">
-            AND GRID_ID = #{gridId}
+                AND GRID_ID = #{gridId}
             </if>
             <if test="neighborId != null and neighborId != ''">
             AND VILLAGE_ID = #{neighborId}