Commit 8b7b9e35 authored by tangwei's avatar tangwei

修改bug

parent c1c1714b
...@@ -365,7 +365,7 @@ public class ExcelServiceImpl { ...@@ -365,7 +365,7 @@ public class ExcelServiceImpl {
break; break;
case "LDDW": case "LDDW":
List<LinkageUnitDto> LinkageUnitDtoList = null; List<LinkageUnitDto> LinkageUnitDtoList = null;
String inAgreement = par.containsKey("inAgreement")?par.get("inAgreement").toString():""; String inAgreement = par.containsKey("inAgreement")&&!(par.get("inAgreement").toString()).equals("null")?par.get("inAgreement").toString():"";
if(par.size()>0) { if(par.size()>0) {
LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel(par.containsKey("unitName")?par.get("unitName").toString():null, LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel(par.containsKey("unitName")?par.get("unitName").toString():null,
...@@ -379,6 +379,8 @@ public class ExcelServiceImpl { ...@@ -379,6 +379,8 @@ public class ExcelServiceImpl {
List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(LinkageUnitDtoList), Map.class); List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(LinkageUnitDtoList), Map.class);
List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll("linkageUnit"); List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll("linkageUnit");
linkageUnitListMap.forEach(i -> { linkageUnitListMap.forEach(i -> {
if ( i.get("instanceId") != null){ if ( i.get("instanceId") != null){
String mainString = i.get("instanceId").toString(); String mainString = i.get("instanceId").toString();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment