diff --git a/src/controllers/SalaryController.ts b/src/controllers/SalaryController.ts index b2e8192..31826c8 100644 --- a/src/controllers/SalaryController.ts +++ b/src/controllers/SalaryController.ts @@ -272,7 +272,14 @@ export class Salary extends Controller { const [salary, total] = await this.salaryRepository.findAndCount({ relations: ["posLevel_", "posType_"], order: { - startDate: "DESC", + // startDate: "DESC", + isActive: "ASC", + posType_: { + posTypeRank: "ASC" + }, + posLevel_: { + posLevelRank: "ASC" + }, }, ...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }), });