From 62854978bf0bdbe749b42f8e40ab227ab31ec92f Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sun, 20 Oct 2024 01:55:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95=E6=A0=A1=E9=AA=8Ccname?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pipeline/service/pipeline-service.ts | 15 +++++++++------ .../modules/pipeline/service/storage-service.ts | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) 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 8dc0888c..4f4a9086 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 @@ -74,14 +74,17 @@ export class PipelineService extends BaseService { pipelineIds.push(record.id); recordMap[record.id] = record; } - const vars = await this.storageService.findPipelineVars(pipelineIds); - for (const varEntity of vars) { - const record = recordMap[varEntity.namespace]; - if (record) { - const value = JSON.parse(varEntity.value); - record.lastVars = value.value; + if (pipelineIds?.length > 0) { + const vars = await this.storageService.findPipelineVars(pipelineIds); + for (const varEntity of vars) { + const record = recordMap[varEntity.namespace]; + if (record) { + const value = JSON.parse(varEntity.value); + record.lastVars = value.value; + } } } + return result; } diff --git a/packages/ui/certd-server/src/modules/pipeline/service/storage-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/storage-service.ts index 0f5c77b4..d957a9cd 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/storage-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/storage-service.ts @@ -45,7 +45,7 @@ export class StorageService extends BaseService { async findPipelineVars(pipelineIds: number[]) { if (pipelineIds == null || pipelineIds.length === 0) { - throw new Error('pipelineIds 不能为空'); + return []; } return await this.repository.find({ where: { @@ -58,7 +58,7 @@ export class StorageService extends BaseService { async getPipelinePrivateVars(pipelineId: number) { if (pipelineId == null) { - throw new Error('pipelineId 不能为空'); + return []; } const res = await this.repository.findOne({ where: {