居民防疫列表查询调整下

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,10 +1692,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      */
     @Override
     public PageData<EpidemicPreventionResultDTO> epidemicPreventionList(EpidemicPreventionFormDTO formDTO) {
+        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()){
             PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());