优化完善包容分支

javalibrary · Aug 9, 2024 · e41a345 · e41a345
1 parent 5ce7f3e
commit e41a345
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/flowlong-core/src/main/java/com/aizuda/bpm/engine/model/NodeModel.java b/flowlong-core/src/main/java/com/aizuda/bpm/engine/model/NodeModel.java
@@ -216,6 +216,17 @@ public class NodeModel implements ModelInstance, Serializable {
      */
     @Override
     public boolean execute(FlowLongContext flowLongContext, Execution execution) {
+
+        if (ObjectUtils.isNotEmpty(conditionNodes)) {
+            /*
+             * 执行条件分支
+             */
+            flowLongContext.getFlowConditionHandler()
+                    .getConditionNode(flowLongContext, execution, this)
+                    .ifPresent(t -> this.executeConditionNode(flowLongContext, execution, t));
+            return true;
+        }
+
         if (ObjectUtils.isNotEmpty(parallelNodes)) {
             /*
              * 执行并行分支
@@ -240,16 +251,6 @@ public boolean execute(FlowLongContext flowLongContext, Execution execution) {
             return true;
         }
 
-        if (ObjectUtils.isNotEmpty(conditionNodes)) {
-            /*
-             * 执行条件分支
-             */
-            flowLongContext.getFlowConditionHandler()
-                    .getConditionNode(flowLongContext, execution, this)
-                    .ifPresent(t -> this.executeConditionNode(flowLongContext, execution, t));
-            return true;
-        }
-
         /*
          * 执行 1、审批任务 2、创建抄送 5、办理子流程 6、定时器任务 7、触发器任务
          */