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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2025-08-22 10:20:11 +07:00
commit f03a12f000
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/controllers/ProfileController.ts
View file

@ -6284,11 +6284,14 @@ export class ProfileController extends Controller {
"orgChild4.orgChild4ShortName",
"orgChild4.orgChild4Order",
])
.where(node && nodeId ? "current_holders.orgRevisionId = :orgRevisionId" : "1=1", {
orgRevisionId:
node && nodeId
? (await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } }))?.id
: undefined,
// .where(node && nodeId ? "current_holders.orgRevisionId = :orgRevisionId" : "1=1", {
// orgRevisionId:
// node && nodeId
// ? (await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } }))?.id
// : undefined,
// })
.where("current_holders.orgRevisionId = :orgRevisionId", {
orgRevisionId: (await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } }))?.id
})
.andWhere(
_data.root != undefined && _data.root != null