diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java index 2a28a0fc2f8428ac1a59393648c58383c3d70d6d..478ae1136300c0300b530f16a313ef22739b67c1 100644 --- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java +++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java @@ -899,6 +899,8 @@ public class DeployPipelineConfigManager { disabledPhaseIdList.remove(overridePhaseVo.getId()); } overridePhaseVo.setGroupSort(pipelinePhaseVo.getGroupSort()); + // 模块层或环境层被重载后,修改应用层阶段顺序,回显模块层或环境层阶段时还是用应用层的顺序 + overridePhaseVo.setSort(pipelinePhaseVo.getSort()); pipelinePhaseList.set(index, overridePhaseVo); break; } @@ -924,6 +926,8 @@ public class DeployPipelineConfigManager { int index = 0; for (DeployPipelineGroupVo pipelineGroupVo : pipelineGroupList) { if (Objects.equals(overrideGroupVo.getUuid(), pipelineGroupVo.getUuid())) { + // 模块层或环境层被重载后,修改应用层阶段组顺序,回显模块层或环境层阶段组时还是用应用层的顺序 + overrideGroupVo.setSort(pipelineGroupVo.getSort()); pipelineGroupList.set(index, overrideGroupVo); break; }