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

[Fix Bug] #124

Browse source
This commit is contained in:
Bright 2025-05-22 15:05:54 +07:00
parent fc92c378e8
commit fa7445275b
5 changed files with 71 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/ProfileEmployeeController.ts
View file

@ -5626,7 +5626,7 @@ export class ProfileEmployeeController extends Controller {
? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgRoot.orgRootShortName}`
: null;
const dest_item = await this.salaryRepo.findOne({
where: { profileId: id },
where: { profileEmployeeId: id },
order: { order: "DESC" },
});
const data: any = {
@ -5638,7 +5638,9 @@ export class ProfileEmployeeController extends Controller {
posNo: orgRevisionRef?.posMasterNo,
positionExecutive: "",
positionType: profile.posType?.posTypeName,
positionLevel: profile.posLevel?.posLevelName,
positionLevel: profile.posType && profile.posLevel
? `${profile.posType?.posTypeShortName} ${profile.posLevel?.posLevelName}`
: "",
amountSpecial: profile.amountSpecial,
orgRoot: orgRootRef?.orgRootName,
orgChild1: orgChild1Ref?.orgChild1Name,