hrms-bangkok/hrms-api-salary
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-10 16:24:47 +07:00
parent 1126df613c
commit 95a8d06390
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/controllers/ReportController.ts
View file

@ -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) => ({