From b1ff163a2828b205297408d5aed21cf1eff335e8 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 20 Mar 2026 17:48:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E7=89=88id?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E5=AF=BC=E8=87=B4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=88=B0=E9=94=99=E8=AF=AF=E7=9A=84=E6=A8=A1=E7=89=88=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E7=BA=BFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/certd-client/src/views/certd/pipeline/detail.vue     | 6 +++---
 .../src/modules/pipeline/service/pipeline-service.ts        | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/ui/certd-client/src/views/certd/pipeline/detail.vue b/packages/ui/certd-client/src/views/certd/pipeline/detail.vue
index fd3c3d9db..a27fbaff9 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/detail.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/detail.vue
@@ -29,15 +29,15 @@ const pipelineOptions: PipelineOptions = {
     onLoaded(detail);
     return {
       pipeline: {
-        id: detail.pipeline.id,
         stages: [],
         triggers: [],
         ...JSON.parse(detail.pipeline.content || "{}"),
-        type: detail.pipeline.type,
-        from: detail.pipeline.from,
+        id: detail.pipeline.id,
         userId: detail.pipeline.userId,
         projectId: detail.pipeline.projectId,
       },
+      type: detail.pipeline.type,
+      from: detail.pipeline.from,
       validTime: detail.pipeline.validTime,
       webhookKey: detail.pipeline.webhookKey,
       id: detail.pipeline.id,
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index 363ff060a..06df80d7b 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -274,6 +274,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
     RunnableCollection.initPipelineRunnableType(pipeline);
     pipeline.userId = bean.userId;
     pipeline.projectId = bean.projectId;
+    if (bean.id) {
+      pipeline.id = bean.id;
+    }
     let domains = [];
     if (pipeline.stages) {
       RunnableCollection.each(pipeline.stages, (runnable: any) => {