diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java index 87858eefe2847e17dc25d10547d2aa5807ed2378..b0fc9240a78566815fc3e7bb5624665338b4e02e 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java @@ -527,6 +527,20 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService { builder.setScenarioId(scenarioId); } + AutoexecCombopExecuteConfigVo combopExecuteConfig = versionConfigVo.getExecuteConfig(); + if (combopExecuteConfig != null) { + // 执行器组 + ParamMappingVo runnerGroup = combopExecuteConfig.getRunnerGroup(); + if (runnerGroup != null) { + builder.setRunnerGroup(runnerGroup); + } + + // 执行器组标签 + ParamMappingVo runnerGroupTag = combopExecuteConfig.getRunnerGroupTag(); + if (runnerGroupTag != null) { + builder.setRunnerGroupTag(runnerGroupTag); + } + } autoexecCombopService.needExecuteConfig(autoexecCombopVersionVo); boolean needExecuteUser = autoexecCombopVersionVo.getNeedExecuteUser(); boolean needExecuteNode = autoexecCombopVersionVo.getNeedExecuteNode(); @@ -663,6 +677,9 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService { } } } + if (MapUtils.isNotEmpty(runtimeParamMap)) { + param.putAll(runtimeParamMap); + } for (AutoexecParamVo autoexecParamVo : lastRuntimeParamList) { if (param.containsKey(autoexecParamVo.getKey())) { continue;