From 30ba77f92d3de0442c75d831f6e712ebbf525361 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 7 Aug 2025 14:45:50 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E5=88=9B=E5=BB=BA=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E9=A1=B5=E9=9D=A2=E5=A6=82=E6=9E=9C=E6=89=80=E6=9C=89?=
 =?UTF-8?q?runner=E9=98=B6=E6=AE=B5=E9=83=BD=E8=AE=BE=E7=BD=AE=E4=BA=86?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E7=BB=84=EF=BC=8C=E5=88=99=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=97=B6=E5=80=99=E6=97=A0?=
 =?UTF-8?q?=E9=9C=80=E8=AE=BE=E7=BD=AE=E6=89=A7=E8=A1=8C=E5=99=A8=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1478301363699712]后端-组合工具创建作业页面如果所有runner阶段都设置了执行器组，则创建作业的时候无需设置执行器组 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1478301363699712
---
 .../service/AutoexecCombopServiceImpl.java    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java
index bb64dfa3..7a8b6bd5 100644
--- a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java
+++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java
@@ -905,14 +905,13 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex
             AutoexecCombopPhaseConfigVo autoexecCombopPhaseConfigVo = autoexecCombopPhaseVo.getConfig();
             executeConfigVo = autoexecCombopPhaseConfigVo.getExecuteConfig();
         }
-        if (executeConfigVo == null) {
-            needExecuteUser = true;
-            needProtocol = true;
-            needExecuteNode = true;
-            needRoundCount = true;
-            needRunnerGroup = true;
-        } else {
-            if (Objects.equals(execMode, ExecMode.TARGET.getValue()) || Objects.equals(execMode, ExecMode.RUNNER_TARGET.getValue())) {
+        if (Objects.equals(execMode, ExecMode.TARGET.getValue()) || Objects.equals(execMode, ExecMode.RUNNER_TARGET.getValue())) {
+            if (executeConfigVo == null) {
+                needExecuteUser = true;
+                needProtocol = true;
+                needExecuteNode = true;
+                needRoundCount = true;
+            } else {
                 if (!needProtocol) {
                     Long protocolId = executeConfigVo.getProtocolId();
                     if (protocolId == null) {
@@ -946,7 +945,10 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex
                     }
                 }
             }
-            if (Objects.equals(execMode, ExecMode.RUNNER.getValue())) {
+        } else if (Objects.equals(execMode, ExecMode.RUNNER.getValue())) {
+            if (executeConfigVo == null) {
+                needRunnerGroup = true;
+            } else {
                 if (!needRunnerGroup) {
                     ParamMappingVo runnerGroup = executeConfigVo.getRunnerGroup();
                     if (runnerGroup == null || runnerGroup.getValue() == null) {
-- 
Gitee