From ed8fc5f674544d3af63c6f68093ffc038385c493 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 十二月 2024 09:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java
index cf7b284..e60dae5 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java
@@ -14,6 +14,7 @@
import org.flowable.engine.impl.util.TaskHelper;
import org.flowable.task.service.TaskService;
import org.flowable.task.service.impl.persistence.entity.TaskEntity;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Set;
@@ -36,14 +37,16 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
protected void handleAssignments(TaskService taskService, String assignee, String owner,
- List<String> candidateUsers, List<String> candidateGroups, TaskEntity task, ExpressionManager expressionManager,
- DelegateExecution execution, ProcessEngineConfigurationImpl processEngineConfiguration) {
+ List<String> candidateUsers, List<String> candidateGroups, TaskEntity task, ExpressionManager expressionManager,
+ DelegateExecution execution, ProcessEngineConfigurationImpl processEngineConfiguration) {
// 第一步，获得任务的候选用户
Long assigneeUserId = calculateTaskCandidateUsers(execution);
- Assert.notNull(assigneeUserId, "任务处理人不能为空");
// 第二步，设置作为负责人
- TaskHelper.changeTaskAssignee(task, String.valueOf(assigneeUserId));
+ if (assigneeUserId != null) {
+ TaskHelper.changeTaskAssignee(task, String.valueOf(assigneeUserId));
+ }
}
private Long calculateTaskCandidateUsers(DelegateExecution execution) {
@@ -55,7 +58,10 @@
// 情况二，如果非多实例的任务，则计算任务处理人
// 第一步，先计算可处理该任务的处理人们
- Set<Long> candidateUserIds = taskCandidateInvoker.calculateUsers(execution);
+ Set<Long> candidateUserIds = taskCandidateInvoker.calculateUsersByTask(execution);
+ if (CollUtil.isEmpty(candidateUserIds)) {
+ return null;
+ }
// 第二步，后随机选择一个任务的处理人
// 疑问：为什么一定要选择一个任务处理人？
// 解答：项目对 bpm 的任务是责任到人，所以每个任务有且仅有一个处理人。
--
Gitblit v1.9.3