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

no message

Browse source
This commit is contained in:
kittapath 2025-02-18 23:02:38 +07:00
parent 28bfc04d64
commit 539f433bd7
4 changed files with 242 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileController.ts
View file

@ -4386,9 +4386,6 @@ export class ProfileController extends Controller {
.andWhere(nodeCondition, {
nodeId: nodeId,
})
// .andWhere(`current_holders.orgRevisionId LIKE :orgRevisionId`, {
// orgRevisionId: revisionId,
// })
.orderBy("current_holders.posMasterNo", "ASC")
.skip((page - 1) * pageSize)
.take(pageSize)
@ -7303,6 +7300,7 @@ export class ProfileController extends Controller {
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.leftJoinAndSelect("current_holders.positions", "positions")
.leftJoinAndSelect("positions.posExecutive", "posExecutive")
.andWhere("profile.isLeave = false")
.andWhere(
_data.root != undefined && _data.root != null
? _data.root[0] != null