新增模型结束节点判断处理逻辑

flowlong-core/src/main/java/com/aizuda/bpm/engine/model/ModelHelper.java

@@ -84,7 +84,7 @@ public class ModelHelper {
                 // 获取路由分支子节点
                 nextNodes.addAll(getNextChildNodes(flowLongContext, execution, rootNodeModel, childNode.getChildNode()));
             }
-        } else {
+        } else if (!TaskType.end.eq(childNode.getType())) {
             // 普通节点
             nextNodes.add(childNode);
         }

flowlong-core/src/main/java/com/aizuda/bpm/engine/model/NodeModel.java

@@ -438,6 +438,9 @@ public class NodeModel implements ModelInstance, Serializable {
         if (null == nextNode) {
             // 如果当前节点完成，并且该节点为条件节点，找到主干执行节点继续执行
             nextNode = ModelHelper.findNextNode(this, currentTask);
+        } else if(TaskType.end.eq(nextNode.getType())) {
+            // 执行到结束节点
+            nextNode = null;
         }
         return Optional.ofNullable(nextNode);
     }

flowlong-spring-boot-starter/src/test/java/test/mysql/TestNextChildNodes.java

@@ -51,6 +51,9 @@ public class TestNextChildNodes extends TestModel {
         }});
 
         assertEquals("flk1733658019276", "flk1733658095760", processModel);
+
+        // 结束
+        assertConsumer("flk1733658019276", processModel, null, nodeModels -> Assertions.assertTrue(nodeModels.isEmpty()));
     }
 
     private void assertEquals(String nextNodeKey, String nodeKey, ProcessModel processModel) {

flowlong-spring-boot-starter/src/test/resources/test/testNextChildNodes.json

@@ -367,7 +367,12 @@
                     "allowAppendNode": false,
                     "allowRollback": false,
                     "rejectStrategy": 2,
-                    "rejectStart": 1
+                    "rejectStart": 1,
+                    "childNode": {
+                      "nodeName": "结束",
+                      "nodeKey": "flk1733380933011",
+                      "type": -1
+                    }
                   }
                 }
               }