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

Merge remote-tracking branch 'origin/feature/REQ-2924' into feature/REQ-2924

Browse Source
This commit is contained in:
wangli 2024-09-12 16:00:27 +08:00
commit 261819358f
3 changed files with 3 additions and 3 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/engine/cmd/CustomBackTaskAsyncCmd.java
View File

@ -60,7 +60,7 @@ public class CustomBackTaskAsyncCmd extends AbstractCommand<String> 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());
}

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBackTaskCmd.java
View File

@ -82,7 +82,7 @@ public class CustomBackTaskCmd extends AbstractCommand<Void> 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());

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCommandContext.java
View File

@ -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);