From d5452f48951a5540d2df44c55e494e75560b3866 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 11:42:39 +0800
Subject: [PATCH] fix(bpm): 审批结果事件带上流程分类,修复历史自定义 Key 流程状态不回写

---
 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/event/BpmProcessInstanceStatusEvent.java         |    6 ++++++
 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/event/BpmProcessInstanceStatusEventListener.java |    4 +++-
 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java      |   14 ++++++++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/event/BpmProcessInstanceStatusEvent.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/event/BpmProcessInstanceStatusEvent.java
index 6682d23..9ff26b5 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/event/BpmProcessInstanceStatusEvent.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/event/BpmProcessInstanceStatusEvent.java
@@ -24,6 +24,12 @@
     @NotNull(message = "娴佺▼瀹炰緥鐨� key 涓嶈兘涓虹┖")
     private String processDefinitionKey;
     /**
+     * 娴佺▼鎵�灞炲垎绫汇��
+     * 涓氬姟妯″潡鐩戝惉瀹℃壒缁撴灉鏃讹紝浼樺厛鎸夊垎绫诲尮閰嶏細鍚屼竴涓笟鍔″垎绫讳笅鍙兘瀛樺湪澶氫釜娴佺▼瀹氫箟 Key锛�
+     * 渚嬪閲囪喘鐢宠鍒嗙被 purchase_request_approve 涓嬫棦鏈夋爣鍑� Key锛屼篃鏈夊巻鍙查仐鐣欑殑鑷畾涔� Key銆�
+     */
+    private String processDefinitionCategory;
+    /**
      * 娴佺▼瀹炰緥鐨勭粨鏋�
      */
     @NotNull(message = "娴佺▼瀹炰緥鐨勭姸鎬佷笉鑳戒负绌�")
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/event/BpmProcessInstanceStatusEventListener.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/event/BpmProcessInstanceStatusEventListener.java
index b3be5d3..ec94888 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/event/BpmProcessInstanceStatusEventListener.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/event/BpmProcessInstanceStatusEventListener.java
@@ -13,7 +13,9 @@
 
     @Override
     public final void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
-        if (!StrUtil.equals(event.getProcessDefinitionKey(), getProcessDefinitionKey())) {
+        // 浼樺厛鎸夋祦绋嬪畾涔� Key 鍖归厤锛涘悓鏃跺吋瀹瑰悓涓�涓氬姟鍒嗙被涓嬬殑鍘嗗彶鑷畾涔� Key锛堟鏃舵寜鍒嗙被鍖归厤锛�
+        if (!StrUtil.equals(event.getProcessDefinitionKey(), getProcessDefinitionKey())
+                && !StrUtil.equals(event.getProcessDefinitionCategory(), getProcessDefinitionKey())) {
             return;
         }
         onEvent(event);
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
index 85ff097..84272e3 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
@@ -12,6 +12,7 @@
 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import cn.iocoder.yudao.framework.common.util.object.PageUtils;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
 import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
@@ -1025,13 +1026,18 @@
         }
 
         // 3. 鍙戦�佹祦绋嬪疄渚嬬殑鐘舵�佷簨浠�
-        processInstanceEventPublisher.sendProcessInstanceResultEvent(
-                BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, instance, status, reason));
+        BpmProcessInstanceStatusEvent statusEvent = BpmProcessInstanceConvert.INSTANCE
+                .buildProcessInstanceStatusEvent(this, instance, status, reason);
+        // 甯︿笂娴佺▼鍒嗙被锛坆pm_process_definition_info.category锛夛紝渚夸簬涓氬姟妯″潡鍏煎鍚屼竴鍒嗙被涓嬬殑鍘嗗彶鑷畾涔� Key
+        BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService
+                .getProcessDefinitionInfo(instance.getProcessDefinitionId());
+        if (processDefinitionInfo != null) {
+            statusEvent.setProcessDefinitionCategory(processDefinitionInfo.getCategory());
+        }
+        processInstanceEventPublisher.sendProcessInstanceResultEvent(statusEvent);
 
         // 4. 娴佺▼鍚庣疆閫氱煡
         if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
-            BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.
-                    getProcessDefinitionInfo(instance.getProcessDefinitionId());
             if (ObjUtil.isNotNull(processDefinitionInfo) &&
                     ObjUtil.isNotNull(processDefinitionInfo.getProcessAfterTriggerSetting())) {
                 BpmModelMetaInfoVO.HttpRequestSetting setting = processDefinitionInfo.getProcessAfterTriggerSetting();

--
Gitblit v1.9.3