From 919f70a5fd2842ca69f96f1659bb5a7ba3f73776 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Thu, 5 Jun 2025 16:29:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pipeline/service/pipeline-service.ts | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 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 3899204c..b90340ff 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 @@ -233,17 +233,18 @@ export class PipelineService extends BaseService { throw new NeedSuiteException(`对不起，您最多只能添加${userSuite.domainCount.max}个域名，请购买或升级套餐`); } } - } - - const userId = bean.userId; - const userIsAdmin = await this.userService.isAdmin(userId); - if (!userIsAdmin) { - //非管理员用户，限制pipeline数量 - const count = await this.repository.count({ where: { userId } }); - const sysPublic = await this.sysSettingsService.getSetting(SysPublicSettings); - const limitUserPipelineCount = sysPublic.limitUserPipelineCount; - if (limitUserPipelineCount && limitUserPipelineCount > 0 && count >= limitUserPipelineCount) { - throw new NeedVIPException(`普通用户最多只能创建${limitUserPipelineCount}条流水线`); + }else{ + //非商业版校验用户最大流水线数量 + const userId = bean.userId; + const userIsAdmin = await this.userService.isAdmin(userId); + if (!userIsAdmin) { + //非管理员用户，限制pipeline数量 + const count = await this.repository.count({ where: { userId } }); + const sysPublic = await this.sysSettingsService.getSetting(SysPublicSettings); + const limitUserPipelineCount = sysPublic.limitUserPipelineCount; + if (limitUserPipelineCount && limitUserPipelineCount > 0 && count >= limitUserPipelineCount) { + throw new NeedVIPException(`普通用户最多只能创建${limitUserPipelineCount}条流水线`); + } } } }