!126 指定的条件节点不存在时，还能接着使用表达式计算

Merge pull request !126 from 读钓/dev
javalibrary · Aug 21, 2024 · b9cc4ac · b9cc4ac
2 parents 3418503 + 2a513f8
commit b9cc4ac
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...ong-core/src/main/java/com/aizuda/bpm/engine/handler/impl/SimpleConditionNodeHandler.java b/...ong-core/src/main/java/com/aizuda/bpm/engine/handler/impl/SimpleConditionNodeHandler.java
@@ -46,7 +46,10 @@ public Optional<ConditionNode> getConditionNode(FlowLongContext flowLongContext,
         // 根据指定条件节点选择
         String conditionNodeKey = FlowDataTransfer.get(FlowConstants.processSpecifyConditionNodeKey);
         if (null != conditionNodeKey) {
-            return conditionNodes.stream().filter(t -> Objects.equals(t.getNodeKey(), conditionNodeKey)).findFirst();
+            Optional<ConditionNode> conditionNodeKeyOptional = conditionNodes.stream().filter(t -> Objects.equals(t.getNodeKey(), conditionNodeKey)).findFirst();
+            if (conditionNodeKeyOptional.isPresent()) {
+                return conditionNodeKeyOptional;
+            }
         }
 
         // 根据正则条件节点选择