Browse Source

导出bug

master
zhangyuan 3 years ago
parent
commit
6183c74071
  1. 3
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java
  2. 2
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
  3. 4
      epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml

3
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 grids = (String) params.get("deptIdList");
String agencyList = (String) params.get("agencyList"); String agencyList = (String) params.get("agencyList");
params.put("deptIdList",null); params.put("deptIdList",null);
params.put("agencyList",null);
if(StringUtils.isNotBlank(grids)){ if(StringUtils.isNotBlank(grids)){
List<String> gridList = Arrays.asList(grids.split(",")); List<String> gridList = Arrays.asList(grids.split(","));
params.put("gridList",gridList); params.put("gridList",gridList);
} }
if(StringUtils.isNotBlank(agencyList)){ if(StringUtils.isNotBlank(agencyList)){
List<String> agencyIdList = Arrays.asList(agencyList.split(",")); List<String> agencyIdList = Arrays.asList(agencyList.split(","));
params.put("agencyList",agencyIdList); params.put("agencyIdList",agencyIdList);
} }
UserDetail user = SecurityUser.getUser(); UserDetail user = SecurityUser.getUser();
if (user == null) { if (user == null) {

2
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<EpidemicUserInf
} }
if (StringUtils.isNotBlank(agencyList)) { if (StringUtils.isNotBlank(agencyList)) {
List<String> agencyIdList = Arrays.asList(agencyList.split(",")); List<String> agencyIdList = Arrays.asList(agencyList.split(","));
params.put("agencyList", agencyIdList); params.put("agencyIdList", agencyIdList);
} else { } else {
params.put("agencyList", null); params.put("agencyList", null);
} }

4
epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml

@ -143,8 +143,8 @@
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="agencyList != null and agencyList.size() > 0"> <if test="agencyIdList != null and agencyIdList.size() > 0">
<foreach collection="agencyList" item="agency" open="AND (" close=")" separator="or" > <foreach collection="agencyIdList" item="agency" open="AND (" close=")" separator="or" >
find_in_set(#{agency},ui.ALL_DEPT_IDS) find_in_set(#{agency},ui.ALL_DEPT_IDS)
</foreach> </foreach>
</if> </if>

Loading…
Cancel
Save