|
|
@@ -63,12 +63,8 @@ export const getCurrentProcess = (processes: IProcess[]) => {
|
|
|
const {
|
|
|
participantInfo: { approvalWay, accounts },
|
|
|
} = processes[i];
|
|
|
- // 上报审批
|
|
|
- // if (approvalWay === ApprovalWay.REPORT) {
|
|
|
- // continue;
|
|
|
- // }
|
|
|
- // 指定用户
|
|
|
- if (approvalWay === ApprovalWay.ACCOUNT) {
|
|
|
+ // 指定用户 或 上报审批
|
|
|
+ if (approvalWay === ApprovalWay.ACCOUNT || approvalWay === ApprovalWay.REPORT) {
|
|
|
const { status } = accounts[0];
|
|
|
if (status === ProcessStatus.ACTIVATING) {
|
|
|
return processes[i];
|