github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复排序失效的bug

pull/213/head
xiaojunnuo 2024-10-14 14:00:24 +08:00
parent cf92db7ed1
commit 1f0742ef9f
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/libs/lib-server/src/basic/base-service.ts
View File

@ -12,7 +12,7 @@ export type PageReq<T = any> = {
export type ListReq<T = any> = { export type ListReq<T = any> = {
query?: Partial<T>; query?: Partial<T>;
order?: { sort?: {
prop: string; prop: string;
asc: boolean; asc: boolean;
}; };
@ -146,10 +146,10 @@ export abstract class BaseService<T> {
} }
private buildListQuery(listReq: ListReq<T>) { private buildListQuery(listReq: ListReq<T>) {
const { query, order, buildQuery } = listReq; const { query, sort, buildQuery } = listReq;
const qb = this.getRepository().createQueryBuilder('main'); const qb = this.getRepository().createQueryBuilder('main');
if (order && order.prop) { if (sort && sort.prop) {
qb.addOrderBy('main.' + order.prop, order.asc ? 'ASC' : 'DESC'); qb.addOrderBy('main.' + sort.prop, sort.asc ? 'ASC' : 'DESC');
} }
qb.addOrderBy('id', 'DESC'); qb.addOrderBy('id', 'DESC');
//根据bean query //根据bean query

2
packages/ui/certd-server/src/controller/cname/cname-record-controller.ts
View File

@ -31,7 +31,7 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
const pageRet = await this.getService().page({ const pageRet = await this.getService().page({
query: body.query, query: body.query,
page: body.page, page: body.page,
order: body.order, sort: body.sort,
buildQuery: bq, buildQuery: bq,
}); });
return this.ok(pageRet); return this.ok(pageRet);

2
packages/ui/certd-server/src/controller/pipeline/access-controller.ts
View File

@ -26,7 +26,7 @@ export class AccessController extends CrudController<AccessService> {
const res = await this.service.page({ const res = await this.service.page({
query: body.query, query: body.query,
page: body.page, page: body.page,
order: body.order, sort: body.sort,
buildQuery, buildQuery,
}); });
return this.ok(res); return this.ok(res);

4
packages/ui/certd-server/src/controller/pipeline/history-controller.ts
View File

@ -68,7 +68,7 @@ export class HistoryController extends CrudController<HistoryService> {
const res = await this.service.page({ const res = await this.service.page({
query: body.query, query: body.query,
page: body.page, page: body.page,
order: body.order, sort: body.sort,
buildQuery, buildQuery,
}); });
return this.ok(res); return this.ok(res);
@ -88,7 +88,7 @@ export class HistoryController extends CrudController<HistoryService> {
}; };
const listRet = await this.getService().list({ const listRet = await this.getService().list({
query: body, query: body,
order: { prop: 'id', asc: false }, sort: { prop: 'id', asc: false },
buildQuery, buildQuery,
}); });
return this.ok(listRet); return this.ok(listRet);

2
packages/ui/certd-server/src/controller/pipeline/pipeline-controller.ts
View File

@ -47,7 +47,7 @@ export class PipelineController extends CrudController<PipelineService> {
const pageRet = await this.getService().page({ const pageRet = await this.getService().page({
query: body.query, query: body.query,
page: body.page, page: body.page,
order: body.order, sort: body.sort,
buildQuery, buildQuery,
}); });
return this.ok(pageRet); return this.ok(pageRet);