From e6c58a64ac12c9688e4e1e09ea4bd21002d0fb25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Tue, 28 Oct 2025 20:02:57 +0800
Subject: [PATCH] =?UTF-8?q?10-28-bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xzd/service/impl/XzdContractDetailsServiceImpl.java   | 8 +++++---
 .../service/impl/XzdContractTerminationServiceImpl.java   | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
index 69f44421..eb87bd44 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
@@ -458,9 +458,11 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
     public void setValue(List<XzdContractDetailsVo> infos){
         for (XzdContractDetailsVo info : infos) {
             //部门名称
-            SysDeptVo sysDeptVo = sysDeptService.selectDeptById(info.getDeptId());
-            if (sysDeptVo != null){
-                info.setDeptName(sysDeptVo.getDeptName());
+            if (info.getDeptId() != null) {
+                SysDeptVo sysDeptVo = sysDeptService.selectDeptById(info.getDeptId());
+                if (sysDeptVo != null) {
+                    info.setDeptName(sysDeptVo.getDeptName());
+                }
             }
             //项目名称
             if (info.getProject() != null) {
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
index ade53511..402b50ce 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
@@ -202,7 +202,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
      *
      * @param processEvent 参数
      */
-    @EventListener(condition = "#processEvent.flowCode.endsWith('XzdContractTermination')")
+    @EventListener(condition = "#processEvent.flowCode.endsWith('XzdContractTermina')")
     @Transactional
     public void processPlansHandler(ProcessEvent processEvent) {
         log.info("承包合同终止审核任务执行了{}", processEvent.toString());
@@ -226,7 +226,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
      *
      * @param processTaskEvent 参数
      */
-    @org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('XzdContractTermination')")
+    @org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('XzdContractTermina')")
     public void processTaskPlansHandlerEquipmentList(ProcessTaskEvent processTaskEvent) {
         log.info("承包合同终止审核任务创建了{}", processTaskEvent.toString());
     }
@@ -238,7 +238,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
      *
      * @param processDeleteEvent 参数
      */
-    @EventListener(condition = "#processDeleteEvent.flowCode.endsWith('XzdContractTermination')")
+    @EventListener(condition = "#processDeleteEvent.flowCode.endsWith('XzdContractTermina')")
     public void processDeletePlansHandlerEquipmentList(ProcessDeleteEvent processDeleteEvent) {
         log.info("承包合同终止计划删除流程事件{}", processDeleteEvent.toString());
     }