From 9225e82edb67f4c2bd47f15a95f1061e9aefa6ea Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Mon, 23 Mar 2026 13:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=8A=A5=E5=91=8A=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BFbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pq/service/impl/TerminalTreeServiceImpl.java  | 15 +++++++++------
 .../report/impl/AreaHarmonicServiceImpl.java      |  5 ++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
index 6f3e4b32b..87ead63c3 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
@@ -193,13 +193,16 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
                 });
 
                 UserLedgerVO userReportPO = userLedgerVOMap.get(objId);
-                if (Objects.isNull(userReportPO)) {
-                    System.out.println(map);
-                }
                 TerminalTree terminalTree = new TerminalTree();
-                terminalTree.setName(userReportPO.getProjectName());
-                terminalTree.setId(userReportPO.getId());
-                terminalTree.setPid(userReportPO.getStationId());
+                if (Objects.isNull(userReportPO)) {
+                    terminalTree.setName("用户对象缺失");
+                    terminalTree.setId(objId);
+                    terminalTree.setPid("");
+                }else {
+                    terminalTree.setName(userReportPO.getProjectName());
+                    terminalTree.setId(userReportPO.getId());
+                    terminalTree.setPid(userReportPO.getStationId());
+                }
                 terminalTree.setPowerFlag(1);
                 terminalTree.setLevel(LineBaseEnum.USER_LEVEL.getCode());
                 terminalTree.setChildren(temDevList);
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/report/impl/AreaHarmonicServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/report/impl/AreaHarmonicServiceImpl.java
index 9ee4d8ab6..efa3cea65 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/report/impl/AreaHarmonicServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/report/impl/AreaHarmonicServiceImpl.java
@@ -25,6 +25,7 @@ import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.po.Dept;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
@@ -49,7 +50,9 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
 
     // 常量定义
     private static final String REPORT_TEMPLATE_PATH = "file/areaReportTemplate.docx";
-    private static final String DEFAULT_PROVIDER_DEPT = "云网能源(曲靖)有限责任公司";
+
+    @Value("${areaReportTitle:上海电力有限公司电力科学研究院}")
+    private String DEFAULT_PROVIDER_DEPT;
     private static final String NO_DATA_PLACEHOLDER = "无";
     private static final String UNKNOWN_VALUE = "/";