From c565a8c4e23e69f70ca1e16b32409503dab81c7f Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Thu, 12 Sep 2024 15:57:54 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2924-=E4=BF=AE=E5=A4=8D=E5=9B=9E=E9=80=80?= =?UTF-8?q?=E5=8F=AF=E8=BE=BE=E8=B7=AF=E5=BE=84=E6=A0=A1=E9=AA=8C=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/workflow/core/engine/cmd/CustomBackTaskAsyncCmd.java | 2 +- .../cn/axzo/workflow/core/engine/cmd/CustomBackTaskCmd.java | 2 +- .../cn/axzo/workflow/core/engine/cmd/CustomCommandContext.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBackTaskAsyncCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBackTaskAsyncCmd.java index be5ecb500..d43b60a7e 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBackTaskAsyncCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBackTaskAsyncCmd.java @@ -60,7 +60,7 @@ public class CustomBackTaskAsyncCmd extends AbstractCommand implements S } FlowElement sourceFlowElement = process.getFlowElement(taskEntity.getTaskDefinitionKey(), true); // 退回节点到当前节点不可达到，不允许退回 - if (!BpmnModelUtils.isReachable(process, (FlowNode) sourceFlowElement, (FlowNode) targetFlowElement)) { + if (!BpmnModelUtils.isReachable(process, (FlowNode) targetFlowElement, (FlowNode) sourceFlowElement)) { throw new WorkflowEngineException(BACK_NODE_CANNOT_REACHABLE, dto.getToActivityId()); } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBackTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBackTaskCmd.java index 53881df93..a3d113c81 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBackTaskCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBackTaskCmd.java @@ -82,7 +82,7 @@ public class CustomBackTaskCmd extends AbstractCommand implements Serializ } FlowElement sourceFlowElement = process.getFlowElement(task.getTaskDefinitionKey(), true); // 退回节点到当前节点不可达到，不允许退回 - if (!BpmnModelUtils.isReachable(process, (FlowNode) sourceFlowElement, (FlowNode) targetFlowElement)) { + if (!BpmnModelUtils.isReachable(process, (FlowNode) targetFlowElement, (FlowNode) sourceFlowElement)) { throw new WorkflowEngineException(BACK_NODE_CANNOT_REACHABLE, dto.getToActivityId()); } batchAddAttachment(commandContext, task.getProcessInstanceId(), dto.getTaskId(), dto.getAttachmentList(), dto.getApprover()); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCommandContext.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCommandContext.java index 18e70a31c..1e70e2247 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCommandContext.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCommandContext.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; * @since 2024/5/21 09:46 */ public class CustomCommandContext extends CommandContext { - private static final Logger LOGGER = LoggerFactory.getLogger(CommandContext.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CustomCommandContext.class); public CustomCommandContext(Command command) { super(command);