ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 加签用户判断

Browse Source
This commit is contained in:
furongxin 2024-09-08 01:39:53 +08:00
parent 5e5d972e8e
commit 5759b8591d
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
View File

@ -885,6 +885,19 @@ public class BpmTaskServiceImpl implements BpmTaskService {
BpmProcessInstanceExtDO processInstance = processInstanceService.getProcessInstanceDO(task.getProcessInstanceId());
// 判断不是加签状态的流程
if (task.getParentTaskId() != null) {
// 获取加签子任务的 父任务task
List<Task> childrenTasks = taskService.createTaskQuery().taskId(task.getParentTaskId()).orderByTaskCreateTime().desc().list();
if (CollUtil.isNotEmpty(childrenTasks) && childrenTasks.get(0).getScopeType().equals(BpmTaskAddSignTypeEnum.BEFORE.getType())) {
return;
}
}
if (task.getAssignee() == null) {
return;
}
// 如果当前审批人是流程发起人
// 则自动通过当前审批节点
if (processInstance.getStartUserId().toString().equals(task.getAssignee())) {
@ -897,16 +910,6 @@ public class BpmTaskServiceImpl implements BpmTaskService {
} else {
// 判断不是加签状态的流程
if (task.getParentTaskId() != null) {
// 获取加签子任务的 父任务task
List<Task> childrenTasks = taskService.createTaskQuery().taskId(task.getParentTaskId()).orderByTaskCreateTime().desc().list();
if (CollUtil.isNotEmpty(childrenTasks) && childrenTasks.get(0).getScopeType().equals(BpmTaskAddSignTypeEnum.BEFORE.getType())) {
return;
}
}
// 判断当前审批人是否在该流程中 已通过审批，
// 如果有，则自动审批通过该审批人节点
Long count = taskExtMapper.selectListCount(Long.valueOf(task.getAssignee()), task.getProcessInstanceId());