diff --git a/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java b/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java index 1a102bac28b8f31b681865af4a2aa4fd86ab80ed..ad343acd220cd6cdaf6ffc1e4160a29f242656b6 100644 --- a/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java +++ b/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java @@ -121,6 +121,7 @@ public class AutoexecCombopDetailGetApi extends PrivateApiComponentBase { autoexecCombopVo.setNeedExecuteUser(autoexecCombopVersionVo.getNeedExecuteUser()); autoexecCombopVo.setNeedProtocol(autoexecCombopVersionVo.getNeedProtocol()); autoexecCombopVo.setNeedRoundCount(autoexecCombopVersionVo.getNeedRoundCount()); + autoexecCombopVo.setNeedRunnerGroup(autoexecCombopVersionVo.getNeedRunnerGroup()); AutoexecCombopConfigVo config = autoexecCombopVo.getConfig(); config.setExecuteConfig(versionConfig.getExecuteConfig()); config.setCombopGroupList(versionConfig.getCombopGroupList()); diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java index 1c79f54812f5115ee8469c5b180d0dfa861d92fc..4e00ca20625542f8d7d325bd4876f6200b208ab8 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java @@ -901,6 +901,7 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex boolean needProtocol = autoexecCombopVersionVo.getNeedProtocol(); boolean needExecuteNode = autoexecCombopVersionVo.getNeedExecuteNode(); boolean needRoundCount = autoexecCombopVersionVo.getNeedRoundCount(); + boolean needRunnerGroup = autoexecCombopVersionVo.getNeedRunnerGroup(); AutoexecCombopExecuteConfigVo executeConfigVo = null; if (Objects.equals(AutoexecJobGroupPolicy.GRAYSCALE.getName(), autoexecCombopGroupVo.getPolicy())) { AutoexecCombopGroupConfigVo autoexecCombopGroupConfigVo = autoexecCombopGroupVo.getConfig(); @@ -947,11 +948,18 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex needRoundCount = true; } } + if (!needRunnerGroup) { + ParamMappingVo runnerGroup = executeConfigVo.getRunnerGroup(); + if (runnerGroup == null || StringUtils.isBlank((String) runnerGroup.getValue())) { + needRunnerGroup = true; + } + } } autoexecCombopVersionVo.setNeedExecuteUser(needExecuteUser); autoexecCombopVersionVo.setNeedExecuteNode(needExecuteNode); autoexecCombopVersionVo.setNeedProtocol(needProtocol); autoexecCombopVersionVo.setNeedRoundCount(needRoundCount); + autoexecCombopVersionVo.setNeedRunnerGroup(needRunnerGroup); } @Override