R5-M1-M5 收口正式审批规则与移动反馈

server/src/services/feeControl.js

@@ -597,14 +597,14 @@ async function buildReimbursementPrecheck(tx, { reimbursementId, config, logger
     blocking.push(buildRiskFlagPreview("missing_approval_rule", RISK_LEVELS.high, "缺少审批规则", "当前金额范围未匹配到有效报销审批规则。"));
   } else {
     const workflowSteps = buildWorkflowStepsFromApprovalRule(approvalRule);
-    const { actionable } = await resolveActionableStep({
+    const { actionable, skipped } = await resolveActionableStep({
       tx,
       steps: workflowSteps,
       startIndex: 0,
       ownerId: reimbursement.owner_id,
       logger,
     });
-    if (!actionable) {
+    if (!actionable || skipped.length) {
       blocking.push(buildRiskFlagPreview("no_actionable_approver", RISK_LEVELS.high, "缺少可执行审批人", "当前审批链未解析出有效审批人。"));
     }
   }
@@ -718,14 +718,14 @@ async function buildPurchaseRequestPrecheck(tx, { purchaseRequestId, config, log
     blocking.push(buildRiskFlagPreview("workflow_definition_missing", RISK_LEVELS.high, "缺少流程定义", "采购申请缺少有效流程定义。"));
   } else {
     const workflowSteps = parseWorkflowSteps(workflowDefinition.definition_json);
-    const { actionable } = await resolveActionableStep({
+    const { actionable, skipped } = await resolveActionableStep({
       tx,
       steps: workflowSteps,
       startIndex: 0,
       ownerId: purchaseRequest.applicant_id,
       logger,
     });
-    if (!actionable) {
+    if (!actionable || skipped.length) {
       blocking.push(buildRiskFlagPreview("no_actionable_approver", RISK_LEVELS.high, "缺少可执行审批人", "当前采购流程未解析出有效审批人。"));
     }
   }
@@ -850,14 +850,14 @@ async function buildTravelRequestPrecheck(tx, { travelRequestId, config, logger
     blocking.push(buildRiskFlagPreview("workflow_definition_missing", RISK_LEVELS.high, "缺少流程定义", "差旅申请缺少有效流程定义。"));
   } else {
     const workflowSteps = parseWorkflowSteps(workflowDefinition.definition_json);
-    const { actionable } = await resolveActionableStep({
+    const { actionable, skipped } = await resolveActionableStep({
       tx,
       steps: workflowSteps,
       startIndex: 0,
       ownerId: travelRequest.applicant_employee_id,
       logger,
     });
-    if (!actionable) {
+    if (!actionable || skipped.length) {
       blocking.push(buildRiskFlagPreview("no_actionable_approver", RISK_LEVELS.high, "缺少可执行审批人", "当前差旅流程未解析出有效审批人。"));
     }
   }