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

fix condition org revision current id of perm and term
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m48s
Details

Browse source
This commit is contained in:
Warunee Tamkoo 2026-02-27 11:57:27 +07:00
parent 49a8494a8d
commit e4f46a1762
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/services/KeycloakAttributeService.ts
View file

@ -116,12 +116,13 @@ export class KeycloakAttributeService {
const profileEmployeeResult = await this.profileEmployeeRepo
.createQueryBuilder("pe")
.leftJoinAndSelect("pe.current_holders", "epm")
.leftJoinAndSelect("epm.orgRoot", "org")
.leftJoinAndSelect("epm.orgRoot", "orgRoot")
.leftJoinAndSelect("epm.orgChild1", "orgChild1")
.leftJoinAndSelect("epm.orgChild2", "orgChild2")
.leftJoinAndSelect("epm.orgChild3", "orgChild3")
.leftJoinAndSelect("epm.orgChild4", "orgChild4")
.where("pe.keycloak = :keycloakUserId", { keycloakUserId })
.andWhere("orgRoot.orgRevisionId = :revisionId", { revisionId })
.getOne();
if (
@ -151,12 +152,13 @@ export class KeycloakAttributeService {
const profileEmployeeResult = await this.profileEmployeeRepo
.createQueryBuilder("pe")
.leftJoinAndSelect("pe.current_holderTemps", "etpm")
.leftJoinAndSelect("etpm.orgRoot", "org")
.leftJoinAndSelect("etpm.orgRoot", "orgRoot")
.leftJoinAndSelect("etpm.orgChild1", "orgChild1")
.leftJoinAndSelect("etpm.orgChild2", "orgChild2")
.leftJoinAndSelect("etpm.orgChild3", "orgChild3")
.leftJoinAndSelect("etpm.orgChild4", "orgChild4")
.where("pe.keycloak = :keycloakUserId", { keycloakUserId })
.andWhere("orgRoot.orgRevisionId = :revisionId", { revisionId })
.getOne();
if (
@ -275,12 +277,13 @@ export class KeycloakAttributeService {
const profileEmployeeResult = await this.profileEmployeeRepo
.createQueryBuilder("pe")
.leftJoinAndSelect("pe.current_holders", "epm")
.leftJoinAndSelect("epm.orgRoot", "org")
.leftJoinAndSelect("epm.orgRoot", "orgRoot")
.leftJoinAndSelect("epm.orgChild1", "orgChild1")
.leftJoinAndSelect("epm.orgChild2", "orgChild2")
.leftJoinAndSelect("epm.orgChild3", "orgChild3")
.leftJoinAndSelect("epm.orgChild4", "orgChild4")
.where("pe.id = :profileId", { profileId })
.andWhere("orgRoot.orgRevisionId = :revisionId", { revisionId })
.getOne();
if (
@ -311,12 +314,13 @@ export class KeycloakAttributeService {
const profileEmployeeResult = await this.profileEmployeeRepo
.createQueryBuilder("pe")
.leftJoinAndSelect("pe.current_holderTemps", "etpm")
.leftJoinAndSelect("etpm.orgRoot", "org")
.leftJoinAndSelect("etpm.orgRoot", "orgRoot")
.leftJoinAndSelect("etpm.orgChild1", "orgChild1")
.leftJoinAndSelect("etpm.orgChild2", "orgChild2")
.leftJoinAndSelect("etpm.orgChild3", "orgChild3")
.leftJoinAndSelect("etpm.orgChild4", "orgChild4")
.where("pe.id = :profileId", { profileId })
.andWhere("orgRoot.orgRevisionId = :revisionId", { revisionId })
.getOne();
if (