wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 会签结束条件增加判断活动实例数量判断

Browse Source
This commit is contained in:
wangli 2024-06-24 15:10:29 +08:00
parent 2c002b682c
commit 698e4d69c1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java
View File

@ -398,7 +398,7 @@ public class BpmTransformUtil {
multiInstanceLoopCharacteristics.setCompletionCondition("${nrOfCompletedInstances > 0}");
} else if (BpmFlowMultiMode.AND.getType().equals(mode.getType())) {
multiInstanceLoopCharacteristics.setCompletionCondition("${nrOfInstances == " +
"nrOfCompletedInstances}");
"nrOfCompletedInstances} || ${nrOfActiveInstances<=0}");
}
}
// 设置审批人为空时,允许自动通过

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnTaskServiceImpl.java
View File

@ -283,7 +283,7 @@ public class BpmnTaskServiceImpl implements BpmnTaskService {
Task task = checkTask(dto.getTenantId(), dto.getUserId(), dto.getTaskId());
// 校验流程实例存在
HistoricProcessInstance instance = processInstanceService.getProcessInstance(
task.getProcessInstanceId(), dto.getTenantId(), true);
task.getProcessInstanceId(), dto.getTenantId(), false);
if (instance == null) {
throw new WorkflowEngineException(PROCESS_INSTANCE_NOT_EXISTS);
}