xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mzl_dev

Browse Source
This commit is contained in:
mzl
2025-09-10 13:39:06 +08:00
parent 7a8c0d6cc3
commit 17efdf01df
10 changed files with 760 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/utils/approval/service/ApprovalFlowService.php
+5 -4
View File
@@ -112,7 +112,7 @@ class ApprovalFlowService
if ((int)$instance->current_step !== $idx) {
// return ['status' => 'noop', 'reason' => 'not_current_step', 'current_step' => (int)$instance->current_step];
// throw new BusinessException("非当前步骤");
return ['status' => 'noop', 'msg' => '非当前步骤'];
return ['status' => 'noop', 'msg' => '非当前审批'];
}
// return ['status' => 'noop', 'reason' => 'no_pending_record'];
return ['status' => 'noop', 'msg' => '无待处理记录'];
@@ -136,7 +136,7 @@ class ApprovalFlowService
if ($outcome === 'pending') {
// return ['status' => 'step_pending'];
return ['status' => 'step_pending', 'msg' => '步骤待定'];
return ['status' => 'step_pending', 'msg' => '审批待定'];
}
// 3) 有结论：关闭本步其余 pending
@@ -386,10 +386,11 @@ class ApprovalFlowService
$resolved = array_unique(array_filter(array_map('intval', $resolved)));
if ($avoidSelf) {
$resolved = array_values(array_filter($resolved, fn($id) => $id !== (int)$instance->initiator_id));
// $resolved = array_values(array_filter($resolved, fn($id) => $id !== (int)$instance->initiator_id));
$resolved = array_values($resolved);
}
if (empty($resolved)) {
throw new BusinessException("步骤未解析到任何审批人");
throw new BusinessException("未解析到任何审批人");
}
return $resolved;
}