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

add position

Browse source
This commit is contained in:
kittapath 2024-12-13 17:42:32 +07:00
parent a5809663c4
commit 139cb542b0
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/OrganizationDotnetController.ts
View file

@ -2611,7 +2611,8 @@ export class OrganizationDotnetController extends Controller {
currentZipCode: item.currentZipCode, currentZipCode: item.currentZipCode,
dutyTimeId: item.dutyTimeId, dutyTimeId: item.dutyTimeId,
dutyTimeEffectiveDate: item.dutyTimeEffectiveDate, dutyTimeEffectiveDate: item.dutyTimeEffectiveDate,
positionLevel: item.profileSalary.length > 0 ? item.profileSalary[0].positionLevel : null, positionLevel: item.posLevel?.posLevelName ?? null,
positionType: item.posType?.posTypeName ?? null,
posNo: shortName, posNo: shortName,
}; };
}), }),
@ -2738,7 +2739,8 @@ export class OrganizationDotnetController extends Controller {
currentZipCode: item.currentZipCode, currentZipCode: item.currentZipCode,
dutyTimeId: item.dutyTimeId, dutyTimeId: item.dutyTimeId,
dutyTimeEffectiveDate: item.dutyTimeEffectiveDate, dutyTimeEffectiveDate: item.dutyTimeEffectiveDate,
positionLevel: item.profileSalary.length > 0 ? item.profileSalary[0].positionLevel : null, positionLevel: item.posLevel?.posLevelName ?? null,
positionType: item.posType?.posTypeName ?? null,
posNo: shortName, posNo: shortName,
}; };
}), }),
@ -2816,6 +2818,8 @@ export class OrganizationDotnetController extends Controller {
const profile = await this.profileRepo.find({ const profile = await this.profileRepo.find({
where: { keycloak: Not(IsNull()) || Not(""), isLeave: false, current_holders: typeCondition }, where: { keycloak: Not(IsNull()) || Not(""), isLeave: false, current_holders: typeCondition },
relations: [ relations: [
"posType",
"posLevel",
"current_holders", "current_holders",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
@ -2864,6 +2868,9 @@ export class OrganizationDotnetController extends Controller {
lastName: item.lastName, lastName: item.lastName,
keycloak: item.keycloak, keycloak: item.keycloak,
posNo: shortName, posNo: shortName,
position: item.position,
positionLevel: item.posLevel?.posLevelName ?? null,
positionType: item.posType?.posTypeName ?? null,
}; };
}), }),
); );
@ -2940,6 +2947,8 @@ export class OrganizationDotnetController extends Controller {
const profile = await this.profileEmpRepo.find({ const profile = await this.profileEmpRepo.find({
where: { keycloak: Not(IsNull()) || Not(""), isLeave: false, current_holders: typeCondition }, where: { keycloak: Not(IsNull()) || Not(""), isLeave: false, current_holders: typeCondition },
relations: [ relations: [
"posType",
"posLevel",
"current_holders", "current_holders",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
@ -2989,6 +2998,9 @@ export class OrganizationDotnetController extends Controller {
citizenId: item.citizenId, citizenId: item.citizenId,
keycloak: item.keycloak, keycloak: item.keycloak,
posNo: shortName, posNo: shortName,
position: item.position,
positionLevel: item.posLevel?.posLevelName ?? null,
positionType: item.posType?.posTypeName ?? null,
}; };
}), }),
); );