diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java index 330823b..bc947d3 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java @@ -40,8 +40,7 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer { String grids = (String) params.get("deptIdList"); String agencyList = (String) params.get("agencyList"); - params.put("deptIdList",null); - params.put("agencyList",null); + if(StringUtils.isNotBlank(grids)){ List gridList = Arrays.asList(grids.split(",")); params.put("gridList",gridList); @@ -59,6 +58,10 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer { params.put("deptIdList", user.getDeptIdList()); } List recordList = epidemicUserInfoDao.getEpidemicUserRecordList(params); + + params.put("deptIdList",null); + params.put("agencyList",null); + List targetList = new ArrayList<>(); if (CollUtil.isNotEmpty(recordList)) { Object target;