mirror of https://github.com/certd/certd
fix: 修复排序失效的bug
parent
cf92db7ed1
commit
1f0742ef9f
|
@ -12,7 +12,7 @@ export type PageReq<T = any> = {
|
|||
|
||||
export type ListReq<T = any> = {
|
||||
query?: Partial<T>;
|
||||
order?: {
|
||||
sort?: {
|
||||
prop: string;
|
||||
asc: boolean;
|
||||
};
|
||||
|
@ -146,10 +146,10 @@ export abstract class BaseService<T> {
|
|||
}
|
||||
|
||||
private buildListQuery(listReq: ListReq<T>) {
|
||||
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
|
||||
|
|
|
@ -31,7 +31,7 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
|
|||
const pageRet = await this.getService().page({
|
||||
query: body.query,
|
||||
page: body.page,
|
||||
order: body.order,
|
||||
sort: body.sort,
|
||||
buildQuery: bq,
|
||||
});
|
||||
return this.ok(pageRet);
|
||||
|
|
|
@ -26,7 +26,7 @@ export class AccessController extends CrudController<AccessService> {
|
|||
const res = await this.service.page({
|
||||
query: body.query,
|
||||
page: body.page,
|
||||
order: body.order,
|
||||
sort: body.sort,
|
||||
buildQuery,
|
||||
});
|
||||
return this.ok(res);
|
||||
|
|
|
@ -68,7 +68,7 @@ export class HistoryController extends CrudController<HistoryService> {
|
|||
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<HistoryService> {
|
|||
};
|
||||
const listRet = await this.getService().list({
|
||||
query: body,
|
||||
order: { prop: 'id', asc: false },
|
||||
sort: { prop: 'id', asc: false },
|
||||
buildQuery,
|
||||
});
|
||||
return this.ok(listRet);
|
||||
|
|
|
@ -47,7 +47,7 @@ export class PipelineController extends CrudController<PipelineService> {
|
|||
const pageRet = await this.getService().page({
|
||||
query: body.query,
|
||||
page: body.page,
|
||||
order: body.order,
|
||||
sort: body.sort,
|
||||
buildQuery,
|
||||
});
|
||||
return this.ok(pageRet);
|
||||
|
|
Loading…
Reference in New Issue