From a4b2bde54571dd89f12b2ba541bc7de63c3a259b Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 9 Jul 2024 12:13:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=9B=86=E6=88=90?= =?UTF-8?q?=E4=B8=8E=E5=8F=91=E5=B8=83-=E8=B7=A8=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=88=96=E7=A7=9F=E6=88=B7=E5=AF=BC=E5=85=A5=E5=90=8C=E5=90=8D?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9A=84=E6=B5=81=E6=B0=B4=E7=BA=BF=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1194182708789248]集成与发布-跨系统或租户导入同名系统的流水线异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1194182708789248 --- .../importexport/handler/AppPipelineImportExportHandler.java | 5 +++++ .../neatlogic/module/deploy/service/PipelineServiceImpl.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/neatlogic/module/deploy/importexport/handler/AppPipelineImportExportHandler.java b/src/main/java/neatlogic/module/deploy/importexport/handler/AppPipelineImportExportHandler.java index 4de8f6bf..bce582bd 100644 --- a/src/main/java/neatlogic/module/deploy/importexport/handler/AppPipelineImportExportHandler.java +++ b/src/main/java/neatlogic/module/deploy/importexport/handler/AppPipelineImportExportHandler.java @@ -128,6 +128,11 @@ public class AppPipelineImportExportHandler extends ImportExportHandlerBase { while (iterator.hasNext()) { DeployAppConfigVo appConfigVo = iterator.next(); DeployPipelineConfigVo config = appConfigVo.getConfig(); + String appSystemAbbrName = appConfigVo.getAppSystemAbbrName(); + appSystem = resourceCrossoverMapper.getAppSystemByName(appSystemAbbrName); + if (appSystem != null) { + appConfigVo.setAppSystemId(appSystem.getId()); + } Long appModuleId = appConfigVo.getAppModuleId(); String appModuleAbbrName = appConfigVo.getAppModuleAbbrName(); Long envId = appConfigVo.getEnvId(); diff --git a/src/main/java/neatlogic/module/deploy/service/PipelineServiceImpl.java b/src/main/java/neatlogic/module/deploy/service/PipelineServiceImpl.java index fadbac77..4457ebcc 100644 --- a/src/main/java/neatlogic/module/deploy/service/PipelineServiceImpl.java +++ b/src/main/java/neatlogic/module/deploy/service/PipelineServiceImpl.java @@ -297,6 +297,7 @@ public class PipelineServiceImpl implements PipelineService { saveDependency(deployAppConfigVo); } } else { + deployAppConfigVo.setId(null); deployAppConfigMapper.insertAppConfig(deployAppConfigVo); saveDependency(deployAppConfigVo); } @@ -319,6 +320,7 @@ public class PipelineServiceImpl implements PipelineService { deployAppConfigMapper.updateAppConfig(deployAppConfigVo); saveModifiedPartConfigDependency(deployAppConfigVo); } else { + deployAppConfigVo.setId(null); deployAppConfigMapper.insertAppConfig(deployAppConfigVo); saveModifiedPartConfigDependency(deployAppConfigVo); } @@ -347,6 +349,7 @@ public class PipelineServiceImpl implements PipelineService { deployAppConfigMapper.updateAppConfig(deployAppConfigVo); saveModifiedPartConfigDependency(deployAppConfigVo); } else { + deployAppConfigVo.setId(null); deployAppConfigMapper.insertAppConfig(deployAppConfigVo); saveModifiedPartConfigDependency(deployAppConfigVo); } -- Gitee