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

fix #240
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m5s
Details

Browse source
This commit is contained in:
harid 2026-07-03 10:34:20 +07:00
parent 30ddb4e3f3
commit cf161f9809
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/controllers/OrganizationDotnetController.ts
View file

@ -7227,7 +7227,9 @@ export class OrganizationDotnetController extends Controller {
dateStart: profileEmp?.dateStart ?? null, dateStart: profileEmp?.dateStart ?? null,
dateAppoint: profileEmp?.dateAppoint ?? null, dateAppoint: profileEmp?.dateAppoint ?? null,
keycloak: profileEmp?.keycloak ?? null, keycloak: profileEmp?.keycloak ?? null,
posNo: `${item.shortName} ${item.posMasterNo}`, posNo: `${item.shortName} ${[item.posMasterNoPrefix, item.posMasterNo, item.posMasterNoSuffix]
.filter((p) => p !== null && p !== undefined && p !== "")
.join(" ")}`,
position: item.position, position: item.position,
positionLevel: item.posLevel, positionLevel: item.posLevel,
positionType: item.posType, positionType: item.posType,
@ -8900,7 +8902,7 @@ export class OrganizationDotnetController extends Controller {
const profiles = await this.profileRepo.find({ const profiles = await this.profileRepo.find({
where: { id: In(profileIds) }, where: { id: In(profileIds) },
select: ["id", "citizenId", "dateStart", "dateAppoint", "keycloak"], select: ["id", "citizenId", "dateStart", "dateAppoint", "keycloak", "posMasterNo"],
}); });
const profileMap = new Map(profiles.map((p) => [p.id, p])); const profileMap = new Map(profiles.map((p) => [p.id, p]));
@ -8918,7 +8920,11 @@ export class OrganizationDotnetController extends Controller {
dateStart: profile?.dateStart ?? null, dateStart: profile?.dateStart ?? null,
dateAppoint: profile?.dateAppoint ?? null, dateAppoint: profile?.dateAppoint ?? null,
keycloak: profile?.keycloak ?? null, keycloak: profile?.keycloak ?? null,
posNo: profile?.posMasterNo ?? `${item.shortName} ${item.posMasterNo}`, posNo:
profile?.posMasterNo ??
`${item.shortName} ${[item.posMasterNoPrefix, item.posMasterNo, item.posMasterNoSuffix]
.filter((p) => p !== null && p !== undefined && p !== "")
.join(" ")}`,
position: item.position, position: item.position,
positionLevel: item.posLevel, positionLevel: item.posLevel,
positionType: item.posType, positionType: item.posType,