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 6f40eaf..330823b 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 @@ -41,13 +41,14 @@ 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); } if(StringUtils.isNotBlank(agencyList)){ List agencyIdList = Arrays.asList(agencyList.split(",")); - params.put("agencyList",agencyIdList); + params.put("agencyIdList",agencyIdList); } UserDetail user = SecurityUser.getUser(); if (user == null) { diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index fdd80ec..3789758 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -144,7 +144,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl agencyIdList = Arrays.asList(agencyList.split(",")); - params.put("agencyList", agencyIdList); + params.put("agencyIdList", agencyIdList); } else { params.put("agencyList", null); } diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml index a248e52..1e7adce 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml @@ -143,8 +143,8 @@ #{id} - - + + find_in_set(#{agency},ui.ALL_DEPT_IDS)