|
@@ -486,7 +486,7 @@ public class ActivitiServiceImpl implements ActivitiService {
|
|
ExamTask examTask = examTaskService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId());
|
|
ExamTask examTask = examTaskService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId());
|
|
|
|
|
|
FlowApproveResult flowApproveResult = tfFlowService.flowApproveUserList(SystemConstant.getHeadOrUserSchoolId(), flowTaskApprovePeopleAllResult.getFlowId());
|
|
FlowApproveResult flowApproveResult = tfFlowService.flowApproveUserList(SystemConstant.getHeadOrUserSchoolId(), flowTaskApprovePeopleAllResult.getFlowId());
|
|
- if (tfFlowApprove.getSetup() != 1) {
|
|
|
|
|
|
+ if (tfFlowApprove.getSetup() != FlowApproveSetupEnum.SUBMIT.getSetup()) {
|
|
Optional.ofNullable(flowApproveResult).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到流程审批记录"));
|
|
Optional.ofNullable(flowApproveResult).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到流程审批记录"));
|
|
}
|
|
}
|
|
List<FlowTaskResult> taskTaskAll = getTaskAll(task.getProcessInstanceId());
|
|
List<FlowTaskResult> taskTaskAll = getTaskAll(task.getProcessInstanceId());
|