From 39ee47d9d2814e04ef04fb04ca9e27f44e9db606 Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Tue, 26 Nov 2024 08:14:12 +0000 Subject: [PATCH] fix: 当无满足条件时选择默认路线 --- yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java index 3495a45..4351c2b 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java @@ -720,7 +720,7 @@ public class BpmnModelUtils { && evalConditionExpress(variables, flow.getConditionExpression())); if (matchSequenceFlow == null) { matchSequenceFlow = CollUtil.findOne(gateway.getOutgoingFlows(), - flow -> ObjUtil.notEqual(gateway.getDefaultFlow(), flow.getId())); + flow -> ObjUtil.equal(gateway.getDefaultFlow(), flow.getId())); // 特殊：没有默认的情况下，并且只有 1 个条件，则认为它是默认的 if (matchSequenceFlow == null && gateway.getOutgoingFlows().size() == 1) { matchSequenceFlow = gateway.getOutgoingFlows().get(0); @@ -742,7 +742,7 @@ public class BpmnModelUtils { && evalConditionExpress(variables, flow.getConditionExpression())); if (CollUtil.isEmpty(matchSequenceFlows)) { matchSequenceFlows = CollUtil.filterNew(gateway.getOutgoingFlows(), - flow -> ObjUtil.notEqual(gateway.getDefaultFlow(), flow.getId())); + flow -> ObjUtil.equal(gateway.getDefaultFlow(), flow.getId())); // 特殊：没有默认的情况下，并且只有 1 个条件，则认为它是默认的 if (CollUtil.isEmpty(matchSequenceFlows) && gateway.getOutgoingFlows().size() == 1) { matchSequenceFlows = gateway.getOutgoingFlows(); -- libgit2 0.21.4