From 404a122fd76ab0b1dc6d7d684915491a10b0504e Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 14 Sep 2023 19:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/harmonic/service/impl/CustomReportServiceImpl.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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<String, String> 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列