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

รายการทะเบียนประวัติถ้าไม่ได้เลือก filter ต้องเรียงจากหน่วยงาน/ส่วนราชการและเลขที่ตำแหน่ง (issue #113)

Browse source
This commit is contained in:
Bright 2025-03-27 14:47:56 +07:00
parent 5f7ed72261
commit abcc0b9246
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/ProfileController.ts
View file

@ -6119,7 +6119,13 @@ export class ProfileController extends Controller {
}), }),
) )
// .orderBy("current_holders.posMasterNo", "ASC") // .orderBy("current_holders.posMasterNo", "ASC")
.orderBy(`${sortBy}`, sort) // .orderBy(`${sortBy}`, sort)
.orderBy("orgRoot.orgRootOrder", sort)
.addOrderBy("orgChild1.orgChild1Order", sort)
.addOrderBy("orgChild2.orgChild2Order", sort)
.addOrderBy("orgChild3.orgChild3Order", sort)
.addOrderBy("orgChild4.orgChild4Order", sort)
.addOrderBy("current_holders.posMasterNo", sort)
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
.take(pageSize) .take(pageSize)
.getManyAndCount(); .getManyAndCount();

8
src/controllers/ProfileEmployeeController.ts
View file

@ -2235,7 +2235,13 @@ export class ProfileEmployeeController extends Controller {
// orgRevisionId: findRevision.id, // orgRevisionId: findRevision.id,
// }) // })
// .orderBy("current_holders.posMasterNo", "ASC") // .orderBy("current_holders.posMasterNo", "ASC")
.orderBy(`${sortBy}`, sort) // .orderBy(`${sortBy}`, sort)
.orderBy("orgRoot.orgRootOrder", sort)
.addOrderBy("orgChild1.orgChild1Order", sort)
.addOrderBy("orgChild2.orgChild2Order", sort)
.addOrderBy("orgChild3.orgChild3Order", sort)
.addOrderBy("orgChild4.orgChild4Order", sort)
.addOrderBy("current_holders.posMasterNo", sort)
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
.take(pageSize) .take(pageSize)
.getManyAndCount(); .getManyAndCount();