update - 更新网关分支中的默认流强制将其"流条件"置空,防止前端误传导致异常

workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java

@@ -453,6 +453,8 @@ public final class BpmnJsonConverterUtil {
 
                 // 设置网关默认流
                 if (Objects.nonNull(branch.getProperty()) && Boolean.TRUE.equals(branch.getProperty().getDefaultBranch())) {
+                    // 如果是默认流, 以防止前端输入错误, 强制置空
+                    sequenceFlow.setConditionExpression(null);
                     gateway.setDefaultFlow(sequenceFlow.getId());
                 }
 
@@ -532,7 +534,7 @@ public final class BpmnJsonConverterUtil {
         //        String fileName = "/Users/wangli/work/company/yizhi/workflow-engine/workflow-engine-server/src/main" +
         //                "/resources/权限点模型.json";
         String fileName = "/Users/wangli/work/company/yizhi/workflow-engine/workflow-engine-server/src/main" +
-                "/resources/test.json";
+                "/resources/kaoqing.json";
         byte[] bytes = Files.readAllBytes(Paths.get(fileName));
         String content = new String(bytes, StandardCharsets.UTF_8);
 

workflow-engine-server/src/main/resources/kaoqing.json

@@ -397,20 +397,7 @@
             "type": "NODE_CONDITION",
             "name": "班组发起",
             "property": {
-              "groups": [
-                {
-                  "conditionsType": "or",
-                  "conditions": [
-                    {
-                      "fieldDataType": "number",
-                      "fieldCode": "type",
-                      "operator": "eq"
-                    }
-                  ]
-                }
-              ],
-              "defaultBranch": true,
-              "groupsType": "and"
+              "defaultBranch": true
             },
             "children": {
               "id": "10",