From 6e98da8a58b29ca550f2b5f45564f9ecf7740b5b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 10:27:07 +0800
Subject: [PATCH] fix(bpm): 修正业务监听器的流程 key 匹配与空单号防护

---
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmResignationApplicationStatusListener.java |    6 ++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/listener/MesProFeedbackStatusListener.java        |    2 +-
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleApprovalListener.java                   |    3 +++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java    |    6 ++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/listener/MesWmSalesNoticeStatusListener.java    |    6 ++++++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmLeaveApplicationStatusListener.java       |    7 +++++++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmTransferApplicationStatusListener.java    |    7 +++++++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmOvertimeApplicationStatusListener.java    |    4 ++++
 8 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmLeaveApplicationStatusListener.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmLeaveApplicationStatusListener.java
index 3a4f422..f153665 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmLeaveApplicationStatusListener.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmLeaveApplicationStatusListener.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.hrm.service.approval.listener;
 
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
 import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmLeaveApplicationDO;
 import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmLeaveApplicationMapper;
@@ -27,6 +28,12 @@
 
     @Override
     public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
+        // 鍙鐞嗚鍋囧鎵瑰垎绫�/娴佺▼ key 鐨勪簨浠讹紝閬垮厤鍏跺畠妯″潡鐩稿悓 businessKey 璇Е鍙�
+        String approveCode = HrmLeaveApplicationService.APPROVE_CATEGORY_CODE;
+        if (!StrUtil.equals(event.getProcessDefinitionKey(), approveCode)
+                && !StrUtil.equals(event.getProcessDefinitionCategory(), approveCode)) {
+            return;
+        }
         // 閫氳繃 businessKey 鏌ヨ璇峰亣鐢宠
         Long applicationId;
         try {
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmOvertimeApplicationStatusListener.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmOvertimeApplicationStatusListener.java
index cabb0c6..0ad8519 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmOvertimeApplicationStatusListener.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmOvertimeApplicationStatusListener.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.hrm.service.approval.listener;
 
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
 import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
 import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
@@ -13,6 +14,9 @@
     @Resource private HrmOvertimeApplicationService service;
     @Override protected String getProcessDefinitionKey() { return HrmOvertimeApplicationService.BPM_PROCESS_DEFINITION_KEY; }
     @Override protected void onEvent(BpmProcessInstanceStatusEvent event) {
+        if (StrUtil.isBlank(event.getBusinessKey())) {
+            return;
+        }
         Integer status = HrmAuditStatusUtils.convertBpmResultToAuditStatus(event.getStatus());
         if (status == null) status = HrmAuditStatusEnum.PROCESS.getStatus();
         service.updateAuditStatus(Long.valueOf(event.getBusinessKey()), status);
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmResignationApplicationStatusListener.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmResignationApplicationStatusListener.java
index ed99865..d825b58 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmResignationApplicationStatusListener.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmResignationApplicationStatusListener.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.hrm.service.approval.listener;
 
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
 import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmResignationApplicationDO;
 import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmResignationApplicationMapper;
@@ -27,6 +28,11 @@
 
     @Override
     public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
+        // 鍙鐞嗙鑱屽鎵规祦绋�/鍒嗙被鐨勪簨浠讹紝閬垮厤鍏跺畠妯″潡鐩稿悓 businessKey 璇Е鍙�
+        if (!StrUtil.equals(event.getProcessDefinitionKey(), HrmResignationApplicationService.BPM_PROCESS_DEFINITION_KEY)
+                && !StrUtil.equals(event.getProcessDefinitionCategory(), HrmResignationApplicationService.APPROVE_CATEGORY_CODE)) {
+            return;
+        }
         // 閫氳繃 businessKey 鏌ヨ绂昏亴鐢宠
         Long applicationId;
         try {
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmTransferApplicationStatusListener.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmTransferApplicationStatusListener.java
index 76225df..7c3a6a3 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmTransferApplicationStatusListener.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/listener/HrmTransferApplicationStatusListener.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.hrm.service.approval.listener;
 
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
 import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmTransferApplicationDO;
 import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmTransferApplicationMapper;
@@ -27,6 +28,12 @@
 
     @Override
     public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
+        // 鍙鐞嗚皟宀楀鎵瑰垎绫�/娴佺▼ key 鐨勪簨浠讹紝閬垮厤鍏跺畠妯″潡鐩稿悓 businessKey 璇Е鍙�
+        String approveCode = HrmTransferApplicationService.APPROVE_CATEGORY_CODE;
+        if (!StrUtil.equals(event.getProcessDefinitionKey(), approveCode)
+                && !StrUtil.equals(event.getProcessDefinitionCategory(), approveCode)) {
+            return;
+        }
         // 閫氳繃 businessKey 鏌ヨ璋冨矖鐢宠
         Long applicationId;
         try {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/listener/MesProFeedbackStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/listener/MesProFeedbackStatusListener.java
index 9156eeb..91d6c70 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/listener/MesProFeedbackStatusListener.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/listener/MesProFeedbackStatusListener.java
@@ -29,7 +29,7 @@
     /**
      * BPM 鐢熶骇鎶ュ伐瀹℃壒娴佺▼瀹氫箟 key
      */
-    private static final String BPM_PROCESS_DEFINITION_KEY = "mes-pro-feedback-audit";
+    private static final String BPM_PROCESS_DEFINITION_KEY = "mes_pro_feedback_audit";
 
     @Resource
     private MesProFeedbackService feedbackService;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java
index c88b0b9..6fd9882 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.mes.service.wm.itemreceipt.listener;
 
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemreceipt.MesWmItemReceiptMapper;
@@ -32,6 +33,11 @@
 
     @EventListener
     public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
+        // 鍙鐞嗛噰璐叆搴撳鎵瑰垎绫�/娴佺▼ key 鐨勪簨浠讹紝閬垮厤鍏跺畠妯″潡鐩稿悓 businessKey 璇Е鍙�
+        if (!StrUtil.equals(event.getProcessDefinitionKey(), ITEM_RECEIPT_APPROVE_CATEGORY_CODE)
+                && !StrUtil.equals(event.getProcessDefinitionCategory(), ITEM_RECEIPT_APPROVE_CATEGORY_CODE)) {
+            return;
+        }
         // 1. 瑙f瀽涓氬姟涓婚敭
         Long receiptId;
         try {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/listener/MesWmSalesNoticeStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/listener/MesWmSalesNoticeStatusListener.java
index 0a0195a..9aef5c5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/listener/MesWmSalesNoticeStatusListener.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/listener/MesWmSalesNoticeStatusListener.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.mes.service.wm.salesnotice.listener;
 
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeMapper;
@@ -24,6 +25,11 @@
 
     @Override
     public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
+        // 鍙鐞嗗彂璐у鎵瑰垎绫�/娴佺▼ key 鐨勪簨浠讹紝閬垮厤鍏跺畠妯″潡鐩稿悓 businessKey 璇Е鍙�
+        if (!StrUtil.equals(event.getProcessDefinitionKey(), "sales_delivery_approve")
+                && !StrUtil.equals(event.getProcessDefinitionCategory(), "sales_delivery_approve")) {
+            return;
+        }
         Long noticeId;
         try {
             noticeId = Long.parseLong(event.getBusinessKey());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleApprovalListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleApprovalListener.java
index 08291e5..e05be89 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleApprovalListener.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/scrap/MesWmScrapSaleApprovalListener.java
@@ -10,6 +10,9 @@
     @Resource private MesWmScrapSaleService service;
     @Override protected String getProcessDefinitionKey() { return MesWmScrapSaleService.PROCESS_KEY; }
     @Override protected void onEvent(BpmProcessInstanceStatusEvent event) {
+        if (cn.hutool.core.util.StrUtil.isBlank(event.getBusinessKey())) {
+            return;
+        }
         service.onApproval(Long.valueOf(event.getBusinessKey()), event.getId(), event.getStatus());
     }
 }

--
Gitblit v1.9.3