From 95a8d06390c4354db97364adcebdb53ec37150e7 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Thu, 10 Apr 2025 16:24:47 +0700 Subject: [PATCH] fix --- src/controllers/ReportController.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 3c9ff90..d6a2d3f 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -7599,12 +7599,12 @@ export class ReportController extends Controller { "salaryProfileEmployee.amountUse", "salaryProfileEmployee.positionSalaryAmount", ]) - .orderBy("salaryProfile.rootOrder", "ASC") - .addOrderBy("salaryProfile.child1Order", "ASC") - .addOrderBy("salaryProfile.child2Order", "ASC") - .addOrderBy("salaryProfile.child3Order", "ASC") - .addOrderBy("salaryProfile.child4Order", "ASC") - .addOrderBy("salaryProfile.posMasterNo", "ASC") + .orderBy("salaryProfileEmployee.rootOrder", "ASC") + .addOrderBy("salaryProfileEmployee.child1Order", "ASC") + .addOrderBy("salaryProfileEmployee.child2Order", "ASC") + .addOrderBy("salaryProfileEmployee.child3Order", "ASC") + .addOrderBy("salaryProfileEmployee.child4Order", "ASC") + .addOrderBy("salaryProfileEmployee.posMasterNo", "ASC") .getMany(); const _salaryRank = salaryRank.map((item) => ({ @@ -7700,12 +7700,12 @@ export class ReportController extends Controller { "salaryProfileEmployee.amountUse", "salaryProfileEmployee.positionSalaryAmount", ]) - .orderBy("salaryProfile.rootOrder", "ASC") - .addOrderBy("salaryProfile.child1Order", "ASC") - .addOrderBy("salaryProfile.child2Order", "ASC") - .addOrderBy("salaryProfile.child3Order", "ASC") - .addOrderBy("salaryProfile.child4Order", "ASC") - .addOrderBy("salaryProfile.posMasterNo", "ASC") + .orderBy("salaryProfileEmployee.rootOrder", "ASC") + .addOrderBy("salaryProfileEmployee.child1Order", "ASC") + .addOrderBy("salaryProfileEmployee.child2Order", "ASC") + .addOrderBy("salaryProfileEmployee.child3Order", "ASC") + .addOrderBy("salaryProfileEmployee.child4Order", "ASC") + .addOrderBy("salaryProfileEmployee.posMasterNo", "ASC") .getMany(); const _salaryRank = salaryRank.map((item) => ({