diff --git a/src/controllers/KpiCapacityController.ts b/src/controllers/KpiCapacityController.ts index cb2b1ea..02bab63 100644 --- a/src/controllers/KpiCapacityController.ts +++ b/src/controllers/KpiCapacityController.ts @@ -239,7 +239,7 @@ export class kpiCapacityController extends Controller { : [{ name: Like(`%${keyword}%`) }, { description: Like(`%${keyword}%`) }], ) .andWhere(type == undefined ? "1=1" : { type: type }) - .orderBy("kpiCapacityDetail.level", "ASC") + .orderBy("kpiCapacity.createdAt", "ASC") .skip((page - 1) * pageSize) .take(pageSize) .getManyAndCount(); diff --git a/src/controllers/KpiGroupController.ts b/src/controllers/KpiGroupController.ts index 658c83b..090f365 100644 --- a/src/controllers/KpiGroupController.ts +++ b/src/controllers/KpiGroupController.ts @@ -152,6 +152,7 @@ export class kpiGroupController extends Controller { const [kpiGroup, total] = await this.kpiGroupRepository.findAndCount({ ...whereClause, ...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }), + order: { createdAt: "ASC" }, }); return new HttpSuccess({ data: kpiGroup, total }); diff --git a/src/controllers/KpiLinkController.ts b/src/controllers/KpiLinkController.ts index f943b1e..85b5016 100644 --- a/src/controllers/KpiLinkController.ts +++ b/src/controllers/KpiLinkController.ts @@ -246,6 +246,7 @@ export class kpiLinkController extends Controller { ) .skip((page - 1) * pageSize) .take(pageSize) + .orderBy("kpiLink.createdAt", "ASC") .getManyAndCount(); if (!kpiLink) {