From a0e838d1eec918e5dc92fe95dc72ac14facb930e Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 9 Dec 2024 02:24:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF=E5=88=86=E7=BB=84=E5=8F=AF=E4=BB=A5=E8=A2=AB=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BA=BA=E7=9C=8B=E8=A7=81=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/controller/cname/cname-provider-controller.ts | 3 ++- .../src/controller/cname/cname-record-controller.ts | 3 ++- .../src/controller/mine/user-settings-controller.ts | 3 ++- .../src/controller/pipeline/access-controller.ts | 3 ++- .../src/controller/pipeline/history-controller.ts | 3 ++- .../src/controller/pipeline/notification-controller.ts | 3 ++- .../src/controller/pipeline/pipeline-group-controller.ts | 7 +++++-- .../src/controller/sys/settings/sys-settings-controller.ts | 4 ---- 8 files changed, 17 insertions(+), 12 deletions(-) diff --git a/packages/ui/certd-server/src/controller/cname/cname-provider-controller.ts b/packages/ui/certd-server/src/controller/cname/cname-provider-controller.ts index 958c40df..919f0fc0 100644 --- a/packages/ui/certd-server/src/controller/cname/cname-provider-controller.ts +++ b/packages/ui/certd-server/src/controller/cname/cname-provider-controller.ts @@ -20,7 +20,8 @@ export class CnameProviderController extends BaseController { @Post('/list', { summary: Constants.per.authOnly }) async list(@Body(ALL) body: any) { - body.userId = this.getUserId(); + body.query = body.query ?? {}; + body.query.userId = this.getUserId(); const res = await this.providerService.list({}); return this.ok(res); } diff --git a/packages/ui/certd-server/src/controller/cname/cname-record-controller.ts b/packages/ui/certd-server/src/controller/cname/cname-record-controller.ts index ecec8ee1..db698220 100644 --- a/packages/ui/certd-server/src/controller/cname/cname-record-controller.ts +++ b/packages/ui/certd-server/src/controller/cname/cname-record-controller.ts @@ -39,7 +39,8 @@ export class CnameRecordController extends CrudController { @Post('/list', { summary: Constants.per.authOnly }) async list(@Body(ALL) body: any) { - body.userId = this.getUserId(); + body.query = body.query ?? {}; + body.query.userId = this.getUserId(); const list = await this.getService().list(body); return this.ok(list); } diff --git a/packages/ui/certd-server/src/controller/mine/user-settings-controller.ts b/packages/ui/certd-server/src/controller/mine/user-settings-controller.ts index 4fa9e951..982d4d4a 100644 --- a/packages/ui/certd-server/src/controller/mine/user-settings-controller.ts +++ b/packages/ui/certd-server/src/controller/mine/user-settings-controller.ts @@ -25,7 +25,8 @@ export class UserSettingsController extends CrudController @Post('/list', { summary: Constants.per.authOnly }) async list(@Body(ALL) body) { - body.userId = this.getUserId(); + body.query = body.query ?? {}; + body.query.userId = this.getUserId(); return super.list(body); } diff --git a/packages/ui/certd-server/src/controller/pipeline/access-controller.ts b/packages/ui/certd-server/src/controller/pipeline/access-controller.ts index b964af88..8abbb536 100644 --- a/packages/ui/certd-server/src/controller/pipeline/access-controller.ts +++ b/packages/ui/certd-server/src/controller/pipeline/access-controller.ts @@ -37,7 +37,8 @@ export class AccessController extends CrudController { @Post('/list', { summary: Constants.per.authOnly }) async list(@Body(ALL) body) { - body.userId = this.getUserId(); + body.query = body.query ?? {}; + body.query.userId = this.getUserId(); return super.list(body); } diff --git a/packages/ui/certd-server/src/controller/pipeline/history-controller.ts b/packages/ui/certd-server/src/controller/pipeline/history-controller.ts index c2393a8e..85ec1782 100644 --- a/packages/ui/certd-server/src/controller/pipeline/history-controller.ts +++ b/packages/ui/certd-server/src/controller/pipeline/history-controller.ts @@ -78,9 +78,10 @@ export class HistoryController extends CrudController { @Post('/list', { summary: Constants.per.authOnly }) async list(@Body(ALL) body) { + body.query = body.query ?? {}; const isAdmin = await this.authService.isAdmin(this.ctx); if (!isAdmin) { - body.userId = this.getUserId(); + body.query.userId = this.getUserId(); } if (body.pipelineId == null) { return this.ok([]); diff --git a/packages/ui/certd-server/src/controller/pipeline/notification-controller.ts b/packages/ui/certd-server/src/controller/pipeline/notification-controller.ts index 18db5c49..77dba97e 100644 --- a/packages/ui/certd-server/src/controller/pipeline/notification-controller.ts +++ b/packages/ui/certd-server/src/controller/pipeline/notification-controller.ts @@ -38,7 +38,8 @@ export class NotificationController extends CrudController @Post('/list', { summary: Constants.per.authOnly }) async list(@Body(ALL) body) { - body.userId = this.getUserId(); + body.query = body.query ?? {}; + body.query.userId = this.getUserId(); return super.list(body); } diff --git a/packages/ui/certd-server/src/controller/pipeline/pipeline-group-controller.ts b/packages/ui/certd-server/src/controller/pipeline/pipeline-group-controller.ts index ec3ffc0f..c26cf77e 100644 --- a/packages/ui/certd-server/src/controller/pipeline/pipeline-group-controller.ts +++ b/packages/ui/certd-server/src/controller/pipeline/pipeline-group-controller.ts @@ -36,7 +36,8 @@ export class PipelineGroupController extends CrudController { @Post('/page', { summary: 'sys:settings:view' }) async page(@Body(ALL) body) { - body.query = body.query ?? {}; - body.query.userId = this.getUserId(); return super.page(body); } @Post('/list', { summary: 'sys:settings:view' }) async list(@Body(ALL) body) { - body.userId = this.getUserId(); return super.list(body); } @Post('/add', { summary: 'sys:settings:edit' }) async add(@Body(ALL) bean) { - bean.userId = this.getUserId(); return super.add(bean); }