区域报告模板bug修改

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();
+                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);

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 = "/";