From c870e2dd6662cc3e62d4f0dc5e54d0667a4f8248 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 2 Apr 2025 17:45:10 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83-=E6=A8=A1=E5=9D=97=E5=B1=82=E5=92=8C?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=B1=82=E7=9A=84=E6=B5=81=E6=B0=B4=E7=BA=BF?=
 =?UTF-8?q?=E7=9A=84=E7=A6=81=E7=94=A8=E3=80=81=E9=87=8D=E8=BD=BD=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1379705725353984]应用发布-模块层和环境层的流水线的禁用、重载标记异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1379705725353984
---
 .../module/deploy/util/DeployPipelineConfigManager.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java
index 7b42a3a1..b216e3de 100644
--- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java
+++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java
@@ -15,6 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 package neatlogic.module.deploy.util;
 
+import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.autoexec.constvalue.ToolType;
 import neatlogic.framework.autoexec.crossover.IAutoexecProfileCrossoverService;
 import neatlogic.framework.autoexec.crossover.IAutoexecServiceCrossoverService;
@@ -348,7 +349,7 @@ public class DeployPipelineConfigManager {
             if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId)
                     && Objects.equals(deployAppConfigVo.getAppModuleId(), appModuleId)
                     && Objects.equals(deployAppConfigVo.getEnvId(), envId)) {
-                return deployAppConfigVo.getConfig();
+                return JSONObject.parseObject(deployAppConfigVo.getConfigStr(), DeployPipelineConfigVo.class);
             }
         }
         return null;
@@ -691,7 +692,7 @@ public class DeployPipelineConfigManager {
      */
     private static DeployPipelineConfigVo mergeDeployPipelineConfig(DeployPipelineConfigVo appConfig, DeployPipelineConfigVo moduleOverrideConfig, DeployPipelineConfigVo envOverrideConfig, String targetLevel, boolean isUpdateProfile, List<Long> profileIdList) {
         if (Objects.equals(targetLevel, "应用")) {
-
+            initPipelineAppConfig(appConfig);
         } else if (Objects.equals(targetLevel, "模块")) {
             initPipelineAppConfig(appConfig);
             pipelinePhaseSetSource(appConfig.getCombopPhaseList(), "应用");
-- 
Gitee