|
|
@ -41,13 +41,14 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer { |
|
|
|
String grids = (String) params.get("deptIdList"); |
|
|
|
String agencyList = (String) params.get("agencyList"); |
|
|
|
|
|
|
|
if(StringUtils.isNotBlank(grids)){ |
|
|
|
if (StringUtils.isNotBlank(grids)) { |
|
|
|
List<String> gridList = Arrays.asList(grids.split(",")); |
|
|
|
params.put("gridList",gridList); |
|
|
|
params.put("gridList", gridList); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(agencyList)){ |
|
|
|
params.put("deptIdList", null); |
|
|
|
if (StringUtils.isNotBlank(agencyList)) { |
|
|
|
List<String> agencyIdList = Arrays.asList(agencyList.split(",")); |
|
|
|
params.put("agencyIdList",agencyIdList); |
|
|
|
params.put("agencyIdList", agencyIdList); |
|
|
|
} |
|
|
|
UserDetail user = SecurityUser.getUser(); |
|
|
|
if (user == null) { |
|
|
@ -59,8 +60,8 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer { |
|
|
|
} |
|
|
|
List<EpidemicRecordListDTO> recordList = epidemicUserInfoDao.getEpidemicUserRecordList(params); |
|
|
|
|
|
|
|
params.put("deptIdList",null); |
|
|
|
params.put("agencyList",null); |
|
|
|
params.put("deptIdList", null); |
|
|
|
params.put("agencyList", null); |
|
|
|
|
|
|
|
List<Object> targetList = new ArrayList<>(); |
|
|
|
if (CollUtil.isNotEmpty(recordList)) { |
|
|
|