From 97c988804f69e153cd9f3668d69d5d55b5120002 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 6 Feb 2024 15:32:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E4=BC=98=E5=8C=96=E9=80=89?= =?UTF-8?q?=E4=BA=BA=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/delegate/AbstractBpmnTaskAssigneeSelector.java | 2 +- .../server/controller/delegate/AdminTaskAssigneeSelector.java | 3 +-- .../controller/delegate/PositionTaskAssigneeSelector.java | 3 +-- .../server/controller/delegate/RoleTaskAssigneeSelector.java | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java index 808422ece..cc4870b06 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java @@ -81,7 +81,7 @@ public abstract class AbstractBpmnTaskAssigneeSelector implements BpmnTaskAssign Assert.notNull(result, "服务调用异常"); // 200自定义处理 if (HttpStatus.HTTP_OK != result.getCode()) { - throw new WorkflowEngineException(CALC_TASK_ASSIGNEE_ERROR, result.getMsg()); + throw new WorkflowEngineException(CALC_TASK_ASSIGNEE_ERROR, "[API:]" + result.getMsg()); } return result.getData(); } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AdminTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AdminTaskAssigneeSelector.java index 6e09fcc58..38bf53ebd 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AdminTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AdminTaskAssigneeSelector.java @@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -69,7 +68,7 @@ public class AdminTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector "通过管理员查询审批人", req); if (CollUtil.isEmpty(flowTaskAssigners)) { - return Collections.emptyList(); + return super.invokeService(userTask, execution, scopeDto); } return BeanUtil.copyToList(flowTaskAssigners, BpmnTaskDelegateAssigner.class); } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/PositionTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/PositionTaskAssigneeSelector.java index 7507670ea..ea6dba68f 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/PositionTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/PositionTaskAssigneeSelector.java @@ -15,7 +15,6 @@ import org.flowable.engine.delegate.DelegateExecution; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -63,7 +62,7 @@ public class PositionTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelect "审批节点: " + userTask.getId() + ", 通过岗位查询审批人", req); if (CollUtil.isEmpty(flowTaskAssigners)) { - return Collections.emptyList(); + return super.invokeService(userTask, execution, scopeDto); } return BeanUtil.copyToList(flowTaskAssigners, BpmnTaskDelegateAssigner.class); } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/RoleTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/RoleTaskAssigneeSelector.java index 230d2154c..b1c40426e 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/RoleTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/RoleTaskAssigneeSelector.java @@ -15,7 +15,6 @@ import org.flowable.engine.delegate.DelegateExecution; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -70,7 +69,7 @@ public class RoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector { .collect(Collectors.toList()); if (CollUtil.isEmpty(flowTaskAssigners)) { - return Collections.emptyList(); + return super.invokeService(userTask, execution, scopeDto); } return flowTaskAssigners.stream().map(u -> BpmnTaskDelegateAssigner.builder() .assignee(String.valueOf(u.getIdentityId()))