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; }