居民防疫列表查询调整下

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(StringUtils.isBlank(formDTO.getAgencyId())){
-        if (null != staffInfo) {
+            //没有指定查询某个组织时，默认查询当前用户所属组织及下级
-            formDTO.setAgencyId(staffInfo.getAgencyId());
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+            if (null != staffInfo) {
+                formDTO.setAgencyId(staffInfo.getAgencyId());
+            }
         }
         List<EpidemicPreventionResultDTO> list = new ArrayList<>();
         if (formDTO.getIsPage()){

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}