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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
Details

Browse source
This commit is contained in:
Adisak 2025-12-15 13:35:46 +07:00
commit 9e8ad37982
1 changed files with 64 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/PositionController.ts
View file

@ -2301,9 +2301,7 @@ export class PositionController extends Controller {
child4: _data.child4, child4: _data.child4,
}, },
) )
.andWhere( .orWhere(
new Brackets((qb) => {
qb.orWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.andWhere( qb.andWhere(
body.keyword != null && body.keyword != "" body.keyword != null && body.keyword != ""
@ -2346,8 +2344,6 @@ export class PositionController extends Controller {
.andWhere(typeCondition) .andWhere(typeCondition)
.andWhere(revisionCondition); .andWhere(revisionCondition);
}), }),
);
}),
) )
.orderBy("orgRoot.orgRootOrder", "ASC") .orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC") .addOrderBy("orgChild1.orgChild1Order", "ASC")