From 6421eb98e0350a3ea87347b8cc58c07070ad5362 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 4 Jul 2022 15:59:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EpidemicUserInfoExportServer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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;