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

Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

Browse source
This commit is contained in:
kittapath 2025-02-26 15:45:59 +07:00
commit 28369b8808
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/CommandController.ts
View file

@ -3423,6 +3423,7 @@ export class CommandController extends Controller {
profileId: profile.id,
commandId: item.commandId,
position: profile.position,
positionName: profile.position,
positionType: profile?.posType?.posTypeName ?? null,
positionLevel: profile?.posLevel?.posLevelName ?? null,
positionExecutive: position?.posExecutive?.posExecutiveName ?? null,
@ -3612,6 +3613,7 @@ export class CommandController extends Controller {
profileEmployeeId: profile.id,
commandId: item.commandId,
position: profile.position,
positionName: profile.position,
positionType: profile?.posType?.posTypeName ?? null,
positionLevel: profile?.posLevel?.posLevelName ?? null,
amount: item.amount ? item.amount : null,

8
src/controllers/ProfileEmployeeController.ts
View file

@ -2836,7 +2836,9 @@ export class ProfileEmployeeController extends Controller {
posTypeId: item.posTypeId,
posTypeName: item.posType?.posTypeName,
posLevelId: item.posLevelId,
posLevelName: item.posLevel?.posLevelName,
posLevelName: item.posLevel == null && item.posType == null
? null
: `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
educationDegree:
latestProfileEducation != null && latestProfileEducation.educationLevel != null
? latestProfileEducation.educationLevel
@ -4635,7 +4637,9 @@ export class ProfileEmployeeController extends Controller {
posTypeId: item.posTypeId,
posTypeName: item.posType?.posTypeName,
posLevelId: item.posLevelId,
posLevelName: item.posLevel?.posLevelName,
posLevelName: item.posLevel == null && item.posType == null
? null
: `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
educationDegree:
latestProfileEducation != null && latestProfileEducation.educationLevel != null
? latestProfileEducation.educationLevel