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 2024-10-09 16:20:43 +07:00
parent 428ed28b64
commit 7b83f91d73
7 changed files with 185 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/ProfileController.ts
View file

@ -4828,6 +4828,7 @@ export class ProfileController extends Controller {
const isProbation: boolean = true;
const [findProfile, total] = await AppDataSource.getRepository(Profile)
.createQueryBuilder("profile")
.leftJoinAndSelect("profile.profileSalary", "profileSalary")
.leftJoinAndSelect("profile.posLevel", "posLevel")
.leftJoinAndSelect("profile.posType", "posType")
.leftJoinAndSelect("profile.current_holders", "current_holders")
@ -4942,6 +4943,10 @@ export class ProfileController extends Controller {
lastName: item.lastName,
position: item.position,
idcard: item.citizenId,
refCommandNo:
item.profileSalary.sort((a, b) => b.order - a.order).length == 0
? null
: item.profileSalary.sort((a, b) => b.order - a.order)[0].refCommandNo,
posLevelName: item.posLevel == null ? null : item.posLevel.posLevelName,
posTypeName: item.posType == null ? null : item.posType.posTypeName,
posNo: posMaster == null ? null : `${posMaster.posMasterNo}${shortName}`,