From e55be75357f9b7278269793749536a21d87f0145 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Mon, 20 Jan 2025 08:39:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E5=91=BD=E5=90=8DRouterConditi?=
 =?UTF-8?q?on->RouterSetting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/vo/model/simple/BpmSimpleModelNodeVO.java    | 4 ++--
 .../bpm/framework/flowable/core/util/SimpleModelUtils.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
index 239a4fd036..ad9603dff5 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
@@ -110,7 +110,7 @@ public class BpmSimpleModelNodeVO {
     private ConditionSetting conditionSetting; // 仅用于条件节点 BpmSimpleModelNodeType.CONDITION_NODE
 
     @Schema(description = "路由分支组", example = "[]")
-    private List<RouterCondition> routerGroups;
+    private List<RouterSetting> routerGroups;
 
     @Schema(description = "默认分支 ID", example = "Flow_xxx", hidden = true) // 由后端生成，所以 hidden = true
     private String defaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE
@@ -301,7 +301,7 @@ public class BpmSimpleModelNodeVO {
     @Schema(description = "路由分支")
     @Data
     @Valid
-    public static class RouterCondition {
+    public static class RouterSetting {
 
         @Schema(description = "节点 Id", example = "Activity_xxx") // 跳转到该节点
         @NotEmpty(message = "节点 Id 不能为空")
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
index 568c92c50f..74bcbc1632 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
@@ -200,7 +200,7 @@ public class SimpleModelUtils {
         // 3. 遍历分支节点
         if (nodeType == BpmSimpleModelNodeType.ROUTER_BRANCH_NODE) {
             // 路由分支遍历
-            for (BpmSimpleModelNodeVO.RouterCondition router : node.getRouterGroups()) {
+            for (BpmSimpleModelNodeVO.RouterSetting router : node.getRouterGroups()) {
                 SequenceFlow sequenceFlow = RouteBranchNodeConvert.buildSequenceFlow(node.getId(), router);
                 process.addFlowElement(sequenceFlow);
             }
@@ -637,7 +637,7 @@ public class SimpleModelUtils {
                     node.getConditionSetting().getConditionGroups());
         }
 
-        public static String buildConditionExpression(BpmSimpleModelNodeVO.RouterCondition router) {
+        public static String buildConditionExpression(BpmSimpleModelNodeVO.RouterSetting router) {
             return buildConditionExpression(router.getConditionType(), router.getConditionExpression(),
                     router.getConditionGroups());
         }
@@ -729,7 +729,7 @@ public class SimpleModelUtils {
             return BpmSimpleModelNodeType.ROUTER_BRANCH_NODE;
         }
 
-        public static SequenceFlow buildSequenceFlow(String nodeId, BpmSimpleModelNodeVO.RouterCondition router) {
+        public static SequenceFlow buildSequenceFlow(String nodeId, BpmSimpleModelNodeVO.RouterSetting router) {
             String conditionExpression = ConditionNodeConvert.buildConditionExpression(router);
             return buildBpmnSequenceFlow(nodeId, router.getNodeId(), null, null, conditionExpression);
         }