From 4ee7f3019783909a10fbcc373d29d6ee128eb433 Mon Sep 17 00:00:00 2001
From: liangcheng <1546584672@qq.com>
Date: Thu, 28 Aug 2025 14:10:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E9=94=99=E8=AF=AF=E6=95=B0=E6=8D=AE=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/bo/EbTableMonitorBO.java           | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/bo/EbTableMonitorBO.java b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/bo/EbTableMonitorBO.java
index a08c497..e598f22 100644
--- a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/bo/EbTableMonitorBO.java
+++ b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/bo/EbTableMonitorBO.java
@@ -19,8 +19,10 @@ import org.springframework.stereotype.Component;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.TimeZone;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @Author liang.cheng
@@ -29,6 +31,7 @@ import java.util.stream.Collectors;
  * @Version 1.0
  */
 @Component
+@Slf4j
 public class EbTableMonitorBO {
 
     @Autowired
@@ -45,18 +48,27 @@ public class EbTableMonitorBO {
 
         EmployeePO employeePO = selectEmployee();
         return hrKpiFlows.stream()
+                .filter(Objects::nonNull)
                 .map(hrKpiFlow -> {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
                     sdf.setTimeZone(TimeZone.getTimeZone("GMT+8"));
                     String formattedDate = hrKpiFlow.getRealPeriod() != null
                             ? sdf.format(hrKpiFlow.getRealPeriod())
                             : null;
-                    WeaDepartMent weaDepartMent = departMentService.getDepartMentById(hrKpiFlow.getDepartmentId());
-                    String deptPath = departMentService.getDeptPath(hrKpiFlow.getDepartmentId(), WeaDeptPathLevel.DEPT_ALL_LEVEL, ">", employeePO.getTenantKey());
-                    if (StringUtils.isNotBlank(deptPath)) {
-                        deptPath = deptPath + ">" + weaDepartMent.getDepartMentName();
-                    } else {
-                        deptPath = weaDepartMent.getDepartMentName();
+                    Long departmentId = hrKpiFlow.getDepartmentId();
+                    WeaDepartMent weaDepartMent = departMentService.getDepartMentById(departmentId);
+                    String deptPath = "";
+                    try {
+                            deptPath = departMentService.getDeptPath(departmentId, WeaDeptPathLevel.DEPT_ALL_LEVEL, ">", employeePO.getTenantKey());
+                        if (StringUtils.isNotBlank(deptPath)) {
+                            deptPath = deptPath + ">" + weaDepartMent.getDepartMentName();
+                        } else {
+                            deptPath = weaDepartMent.getDepartMentName();
+                        }
+                    }catch (Exception e) {
+                        log.error("处理 hrKpiFlow ID: {} 时发生异常: {}",
+                                hrKpiFlow.getId(), e.getMessage(), e);
+                        return null;
                     }
 
                     return EbTableMonitorPO.builder()