bug

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java

@@ -12,11 +12,12 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
-import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao;
-import com.elink.esua.epdc.vaccine.epidemic.dto.*;
+import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordDetailDTO;
+import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO;
+import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicReportUserInfoDTO;
+import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserInfoDTO;
 import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO;
 import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO;
-import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity;
 import com.elink.esua.epdc.vaccine.epidemic.excel.EpidecmicUserNewExcel;
 import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
 import com.elink.esua.epdc.vaccine.epidemic.service.impl.EpidemicUserInfoExportServer;
@@ -27,7 +28,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Map;
 
 
@@ -46,8 +46,6 @@ public class EpidemicUserInfoController {
 
     @Autowired
     private EpidemicUserInfoExportServer exportServer;
-    @Autowired
-    private EpidemicUserInfoDao epidemicUserInfoDao;
 
     @GetMapping("page")
     public Result<PageData<EpidemicRecordListDTO>> page(@RequestParam Map<String, Object> params) {

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/v2/EpidemicUserInfoV2Controller.java

@@ -1,34 +1,16 @@
 package com.elink.esua.epdc.vaccine.epidemic.controller.v2;
 
 
-import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.elink.esua.epdc.commons.api.version.ApiVersion;
-import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
-import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordDetailDTO;
-import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO;
-import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicReportUserInfoDTO;
-import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserInfoDTO;
-import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO;
 import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO;
-import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO;
 import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO;
-import com.elink.esua.epdc.vaccine.epidemic.excel.EpidecmicUserNewExcel;
 import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
-import com.elink.esua.epdc.vaccine.epidemic.service.impl.EpidemicUserInfoExportServer;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

@@ -145,6 +145,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         if (StringUtils.isNotBlank(agencyList)) {
             List<String> agencyIdList = Arrays.asList(agencyList.split(","));
             params.put("agencyList", agencyIdList);
+        } else {
+            params.put("agencyList", null);
         }
         UserDetail user = SecurityUser.getUser();
         if (user == null) {