Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop

2024-03-07 15:57:01 +07:00 · 2024-03-07 15:57:01 +07:00 · 93d4ffa7a6
commit 93d4ffa7a6
parent 69df428a4a 50484f7e7c
2 changed files with 26 additions and 25 deletions
--- 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 }),
    });