From 9a38e72d2745be17cc890472ec6b51d5859a1d3e Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 10 Dec 2024 10:56:29 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96-=E6=9C=8D=E5=8A=A1=E7=9B=AE=E5=BD=95=20=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BD=9C=E4=B8=9A=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1305952186236928]自动化-服务目录 创建作业保存报错 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1305952186236928
---
 .../autoexec/service/AutoexecServiceServiceImpl.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java
index 12d12df5..87858eef 100644
--- a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java
+++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java
@@ -682,7 +682,7 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService {
             if (config != null) {
                 ParamMappingVo roundCountParamMappingVo = config.getRoundCount();
                 if (needRoundCount && roundCountParamMappingVo != null) {
-                    if (roundCountParamMappingVo.getValue() != null) {
+                    if (Objects.equals(roundCountParamMappingVo.getMappingMode(), ServiceParamMappingMode.CONSTANT.getValue()) && roundCountParamMappingVo.getValue() != null) {
                         builder.setRoundCount((Integer) roundCountParamMappingVo.getValue());
                     } else {
                         if (roundCount != null) {
@@ -695,7 +695,7 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService {
                 AutoexecCombopExecuteConfigVo executeConfigVo = new AutoexecCombopExecuteConfigVo();
                 ParamMappingVo executeUserParamMappingVo = config.getExecuteUser();
                 if (needExecuteUser && executeUserParamMappingVo != null) {
-                    if (executeUserParamMappingVo.getValue() != null) {
+                    if (Objects.equals(executeUserParamMappingVo.getMappingMode(), ServiceParamMappingMode.CONSTANT.getValue()) && executeUserParamMappingVo.getValue() != null) {
                         executeConfigVo.setExecuteUser(executeUserParamMappingVo);
                     } else {
                         if (executeUser != null) {
@@ -710,7 +710,7 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService {
                 }
                 ParamMappingVo protocolParamMappingVo = config.getProtocol();
                 if (needProtocol && protocolParamMappingVo != null) {
-                    if (protocolParamMappingVo.getValue() != null) {
+                    if (Objects.equals(protocolParamMappingVo.getMappingMode(), ServiceParamMappingMode.CONSTANT.getValue()) && protocolParamMappingVo.getValue() != null) {
                         executeConfigVo.setProtocolId((Long) protocolParamMappingVo.getValue());
                     } else {
                         if (protocol != null) {
@@ -722,7 +722,7 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService {
                 }
                 ParamMappingVo executeNodeParamMappingVo = config.getExecuteNodeConfig();
                 if (needExecuteNode && executeNodeParamMappingVo != null) {
-                    if (executeNodeParamMappingVo.getValue() != null) {
+                    if (Objects.equals(executeNodeParamMappingVo.getMappingMode(), ServiceParamMappingMode.CONSTANT.getValue()) && executeNodeParamMappingVo.getValue() != null) {
                         AutoexecCombopExecuteNodeConfigVo executeNodeConfig2 = JSONObject.toJavaObject((JSONObject) executeNodeParamMappingVo.getValue(), AutoexecCombopExecuteNodeConfigVo.class);
                         executeConfigVo.setExecuteNodeConfig(executeNodeConfig2);
                     } else {
-- 
Gitee