diff --git a/packages/libs/lib-server/src/basic/base-service.ts b/packages/libs/lib-server/src/basic/base-service.ts index 98bf0dfdc..b8b8377b2 100644 --- a/packages/libs/lib-server/src/basic/base-service.ts +++ b/packages/libs/lib-server/src/basic/base-service.ts @@ -12,7 +12,7 @@ export type PageReq = { export type ListReq = { query?: Partial; - order?: { + sort?: { prop: string; asc: boolean; }; @@ -146,10 +146,10 @@ export abstract class BaseService { } private buildListQuery(listReq: ListReq) { - const { query, order, buildQuery } = listReq; + const { query, sort, buildQuery } = listReq; const qb = this.getRepository().createQueryBuilder('main'); - if (order && order.prop) { - qb.addOrderBy('main.' + order.prop, order.asc ? 'ASC' : 'DESC'); + if (sort && sort.prop) { + qb.addOrderBy('main.' + sort.prop, sort.asc ? 'ASC' : 'DESC'); } qb.addOrderBy('id', 'DESC'); //根据bean query 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 c24e5cd53..7a1ad15f8 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 @@ -31,7 +31,7 @@ export class CnameRecordController extends CrudController { const pageRet = await this.getService().page({ query: body.query, page: body.page, - order: body.order, + sort: body.sort, buildQuery: bq, }); return this.ok(pageRet); 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 e05864e86..3ee6e7372 100644 --- a/packages/ui/certd-server/src/controller/pipeline/access-controller.ts +++ b/packages/ui/certd-server/src/controller/pipeline/access-controller.ts @@ -26,7 +26,7 @@ export class AccessController extends CrudController { const res = await this.service.page({ query: body.query, page: body.page, - order: body.order, + sort: body.sort, buildQuery, }); return this.ok(res); 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 ab449d987..f090c13d4 100644 --- a/packages/ui/certd-server/src/controller/pipeline/history-controller.ts +++ b/packages/ui/certd-server/src/controller/pipeline/history-controller.ts @@ -68,7 +68,7 @@ export class HistoryController extends CrudController { const res = await this.service.page({ query: body.query, page: body.page, - order: body.order, + sort: body.sort, buildQuery, }); return this.ok(res); @@ -88,7 +88,7 @@ export class HistoryController extends CrudController { }; const listRet = await this.getService().list({ query: body, - order: { prop: 'id', asc: false }, + sort: { prop: 'id', asc: false }, buildQuery, }); return this.ok(listRet); diff --git a/packages/ui/certd-server/src/controller/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/pipeline/pipeline-controller.ts index a7b6153ab..fb0eebc9c 100644 --- a/packages/ui/certd-server/src/controller/pipeline/pipeline-controller.ts +++ b/packages/ui/certd-server/src/controller/pipeline/pipeline-controller.ts @@ -47,7 +47,7 @@ export class PipelineController extends CrudController { const pageRet = await this.getService().page({ query: body.query, page: body.page, - order: body.order, + sort: body.sort, buildQuery, }); return this.ok(pageRet);