From 5c7d5cd4f32d644392c26f27cbe5b0f200096002 Mon Sep 17 00:00:00 2001
From: HopeLi <1278288511@qq.com>
Date: Sat, 7 Jun 2025 16:53:36 +0800
Subject: [PATCH] =?UTF-8?q?0607=20ljc=20=20=20sca=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/resp/pipeline/PipelineFindResp.java    |  8 +++++++-
 .../pipeline/impl/PipelineServiceImpl.java     | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineFindResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineFindResp.java
index fbd60191..ed9b9764 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineFindResp.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineFindResp.java
@@ -106,10 +106,16 @@ public class PipelineFindResp {
     private List<StageResp> stageList;
 
     /**
-     * 目标id
+     * 目标版本id
      */
     private String targetVersionId;
 
+
+    /**
+     * 目标id
+     */
+    private String targetId;
+
     /**
      * 目标类型
      */
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java
index 6ef74ac2..c03d7525 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java
@@ -18,17 +18,19 @@ import cd.casic.ci.process.process.converter.TemplateConverter;
 import cd.casic.ci.process.process.dal.pipeline.PipStageDao;
 import cd.casic.ci.process.process.dal.pipeline.PipTaskDao;
 import cd.casic.ci.process.process.dal.pipeline.PipelineDao;
+import cd.casic.ci.process.process.dal.pipeline.TargetVersionDao;
 import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
 import cd.casic.ci.process.process.dataObject.stage.PipStage;
+import cd.casic.ci.process.process.dataObject.target.TargetVersion;
 import cd.casic.ci.process.process.dataObject.task.PipTask;
 import cd.casic.ci.process.process.service.pipeline.PipelineService;
 import cd.casic.ci.process.process.service.stage.impl.StageServiceImpl;
 import cd.casic.ci.process.process.service.task.impl.TaskServiceImpl;
 import cd.casic.ci.process.process.service.template.impl.TemplateManagerServiceImpl;
+import cd.casic.ci.process.util.WebFrameworkUtils;
 import cd.casic.framework.commons.exception.ServiceException;
 import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants;
 import cd.casic.framework.commons.pojo.PageResult;
-import cd.casic.ci.process.util.WebFrameworkUtils;
 import cd.casic.framework.security.dal.user.AdminUserDO;
 import cd.casic.framework.tenant.core.service.AdminUserServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -83,6 +85,9 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
     @Resource
     private TemplateConverter templateConverter;
 
+    @Resource
+    private TargetVersionDao targetVersionDao;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String createPipeline(PipelineCreateReq pipelineReq) {
@@ -431,10 +436,21 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
         }
         PipelineFindResp resp = PipelineConverter.INSTANCE.toResp(pipeline);
         setStageAndTask(resp);
+        setTargetId(resp);
 
         return resp;
     }
 
+    private void setTargetId(PipelineFindResp resp) {
+        if (!ObjectUtils.isEmpty(resp.getTargetVersionId())){
+            TargetVersion targetVersion = targetVersionDao.selectById(resp.getTargetVersionId());
+
+            if (!ObjectUtils.isEmpty(targetVersion)){
+                resp.setTargetId(targetVersion.getTargetId());
+            }
+        }
+    }
+
     @Override
     public TreeRunContextResp getPipelineRunState(String pipelineId) {
         BaseRunContext context = contextManager.getContext(pipelineId);