From e2185793c3e362c3332f208d46b8dd513995e7ed Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Sat, 20 Jun 2026 13:45:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[bpm]=20=E5=B9=B6=E8=A1=8C=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E5=90=8E=E7=9A=84=E5=AE=A1=E6=89=B9=E4=BA=BA=E8=87=AA?=
 =?UTF-8?q?=E9=80=89=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D,https://t.zsxq.co?=
 =?UTF-8?q?m/daxv1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/processInstance/detail/modules/operation-button.vue  | 5 +++--
 .../bpm/processInstance/detail/modules/operation-button.vue  | 5 +++--
 .../bpm/processInstance/detail/modules/operation-button.vue  | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
index 85e8cac45..b955d7a24 100644
--- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -354,7 +354,8 @@ async function initNextAssigneesFormField() {
           BpmCandidateStrategyEnum.START_USER_SELECT ===
             node.candidateStrategy) ||
         // 情况二：当前节点是审批人自选
-        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy
+        (isEmpty(node.candidateUsers) &&
+        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy)
       ) {
         nextAssigneesActivityNode.value.push(node);
       }
@@ -396,7 +397,7 @@ function validateNextAssignees() {
   }
   // 如果需要自选审批人，则校验每个节点是否都已配置审批人
   for (const item of nextAssigneesActivityNode.value) {
-    if (isEmpty(approveReasonForm.nextAssignees[item.id])) {
+    if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) {
       message.warning('下一个节点的审批人不能为空!');
       return false;
     }
diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
index be9e04603..fe0c58ccf 100644
--- a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -335,7 +335,8 @@ async function initNextAssigneesFormField() {
           BpmCandidateStrategyEnum.START_USER_SELECT ===
             node.candidateStrategy) ||
         // 情况二：当前节点是审批人自选
-        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy
+        (isEmpty(node.candidateUsers) &&
+        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy)
       ) {
         nextAssigneesActivityNode.value.push(node);
       }
@@ -377,7 +378,7 @@ function validateNextAssignees() {
   }
   // 如果需要自选审批人，则校验每个节点是否都已配置审批人
   for (const item of nextAssigneesActivityNode.value) {
-    if (isEmpty(approveReasonForm.nextAssignees[item.id])) {
+    if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) {
       message.warning('下一个节点的审批人不能为空!');
       return false;
     }
diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
index abad43576..e76cd6e54 100644
--- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -364,7 +364,8 @@ async function initNextAssigneesFormField() {
           BpmCandidateStrategyEnum.START_USER_SELECT ===
             node.candidateStrategy) ||
         // 情况二：当前节点是审批人自选
-        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy
+        (isEmpty(node.candidateUsers) &&
+        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy)
       ) {
         nextAssigneesActivityNode.value.push(node);
       }
@@ -406,7 +407,7 @@ function validateNextAssignees() {
   }
   // 如果需要自选审批人，则校验每个节点是否都已配置审批人
   for (const item of nextAssigneesActivityNode.value) {
-    if (isEmpty(approveReasonForm.nextAssignees[item.id])) {
+    if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) {
       ElMessage.warning('下一个节点的审批人不能为空!');
       return false;
     }