From 6675372419976250257af56259ecdb78471aae25 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Wed, 13 Mar 2024 11:57:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-I?=
 =?UTF-8?q?TSM-=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86-=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E8=8A=82=E7=82=B9=E5=A2=9E=E5=8A=A0=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E3=80=81=E5=A2=9E=E5=8A=A0=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1107309646807040]后端-ITSM-流程管理-自动化节点增加场景参数、增加特殊字符判断 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1107309646807040
---
 .../combop/AutoexecCombopProcessConfigInitApi.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopProcessConfigInitApi.java b/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopProcessConfigInitApi.java
index ebd85148..dbd84983 100644
--- a/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopProcessConfigInitApi.java
+++ b/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopProcessConfigInitApi.java
@@ -190,8 +190,16 @@ public class AutoexecCombopProcessConfigInitApi extends PrivateApiComponentBase
             scenarioParam.put("key", "scenarioId");
             scenarioParam.put("name", "场景");
             scenarioParam.put("isRequired", 1);
-            scenarioParam.put("mappingMode", "");
-            scenarioParam.put("value", "");
+            if (versionConfig.getDefaultScenarioId() != null) {
+                scenarioParam.put("mappingMode", ParamMappingMode.CONSTANT.getValue());
+                scenarioParam.put("value", versionConfig.getDefaultScenarioId());
+            } else if (combopScenarioList.size() == 1) {
+                scenarioParam.put("mappingMode", ParamMappingMode.CONSTANT.getValue());
+                scenarioParam.put("value", combopScenarioList.get(0).getScenarioId());
+            } else {
+                scenarioParam.put("mappingMode", "");
+                scenarioParam.put("value", "");
+            }
             scenarioParamList.add(scenarioParam);
             resultObj.put("scenarioParamList", scenarioParamList);
         }
-- 
Gitee


From a6f634d98d200263ce0cb2e0d51de84d6009cb5e Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Wed, 13 Mar 2024 11:59:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-I?=
 =?UTF-8?q?TSM-=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86-=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E8=8A=82=E7=82=B9=E5=A2=9E=E5=8A=A0=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E3=80=81=E5=A2=9E=E5=8A=A0=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1107309646807040]后端-ITSM-流程管理-自动化节点增加场景参数、增加特殊字符判断 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1107309646807040
---
 .../autoexec/api/combop/AutoexecCombopProcessConfigInitApi.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopProcessConfigInitApi.java b/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopProcessConfigInitApi.java
index dbd84983..5e509448 100644
--- a/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopProcessConfigInitApi.java
+++ b/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopProcessConfigInitApi.java
@@ -197,7 +197,7 @@ public class AutoexecCombopProcessConfigInitApi extends PrivateApiComponentBase
                 scenarioParam.put("mappingMode", ParamMappingMode.CONSTANT.getValue());
                 scenarioParam.put("value", combopScenarioList.get(0).getScenarioId());
             } else {
-                scenarioParam.put("mappingMode", "");
+                scenarioParam.put("mappingMode", ParamMappingMode.CONSTANT.getValue());
                 scenarioParam.put("value", "");
             }
             scenarioParamList.add(scenarioParam);
-- 
Gitee