Merge branch 'develop' into adiDev

2024-03-07 17:39:42 +07:00 · 2024-03-07 17:39:42 +07:00 · 1d6ecd3e67
commit 1d6ecd3e67
parent f9de77f533 f008f5d891
1 changed files with 1 additions and 0 deletions
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@ -650,6 +650,7 @@ export class SalaryPeriodController extends Controller {
        }),
      )
      .orderBy("profile.citizenId", "ASC")
+      .addOrderBy("profile.isReserve", "ASC")
      .skip((body.page - 1) * body.pageSize)
      .take(body.pageSize)
      .getManyAndCount();