Merge branch 'hotfix/20250828' into feature/REQ-4418

# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/service/impl/CheckApproverServiceImpl.java
This commit is contained in:
wangli 2025-08-28 15:13:44 +08:00
commit 213f0450e8

View File

@ -95,7 +95,8 @@ public class CheckApproverServiceImpl implements CheckApproverService {
.filter(i -> !Objects.equals(i.getActivityId(), userTask.getId()))
.filter(i -> !Objects.equals(i.getActivityType(), "exclusiveGateway"))
.filter(i -> !Objects.equals(i.getActivityType(), "sequenceFlow"))
.max(Comparator.comparing(ActivityInstanceEntity::getStartTime))
.filter(i -> !Objects.equals(i.getActivityType(), "startEvent"))
.max(Comparator.comparing(ActivityInstanceEntity::getEndTime))
.ifPresent(i -> {
log.info("CheckApproverServiceImpl#checkApproverExists...上一个节点ID:{},类型:{}", i.getActivityId(), i.getActivityType());
// 与发起人比对