diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java index b62e48521..5240de433 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java @@ -421,7 +421,7 @@ public class CustomReportServiceImpl implements CustomReportService { }); } - if (CollUtil.isEmpty(endList)) { + if (CollUtil.isNotEmpty(endList)) { //数据单位信息 Map unit = unitMap(reportSearchParam.getLineId()); //进行反向赋值到模板 @@ -431,7 +431,6 @@ public class CustomReportServiceImpl implements CustomReportService { jsonArray.forEach(item -> { JSONObject jsonObject = (JSONObject) item; JSONArray itemArr = (JSONArray) jsonObject.get("celldata"); - String celldata = jsonObject.get("celldata").toString(); itemArr.forEach((it) -> { if (Objects.nonNull(it) && !"null".equals(it.toString())) { //获取到1列