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

fix issue #1217

Browse source
This commit is contained in:
Bright 2025-02-25 18:24:38 +07:00
parent 257411fe19
commit 3836062c10
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/ProfileEmployeeController.ts
View file

@ -2806,9 +2806,7 @@ export class ProfileEmployeeController extends Controller {
name: fullName, name: fullName,
birthDate: item.birthDate, birthDate: item.birthDate,
positionLevel: item.posLevelId, positionLevel: item.posLevelId,
positionLevelName: item.posLevel == null && item.posType == null positionLevelName: item.posLevel?.posLevelName,
? null
: `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
positionType: item.posTypeId, positionType: item.posTypeId,
positionTypeName: item.posType?.posTypeName, positionTypeName: item.posType?.posTypeName,
posNo: shortName, posNo: shortName,
@ -2838,7 +2836,9 @@ export class ProfileEmployeeController extends Controller {
posTypeId: item.posTypeId, posTypeId: item.posTypeId,
posTypeName: item.posType?.posTypeName, posTypeName: item.posType?.posTypeName,
posLevelId: item.posLevelId, posLevelId: item.posLevelId,
posLevelName: item.posLevel?.posLevelName, posLevelName: item.posLevel == null && item.posType == null
? null
: `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
educationDegree: educationDegree:
latestProfileEducation != null && latestProfileEducation.educationLevel != null latestProfileEducation != null && latestProfileEducation.educationLevel != null
? latestProfileEducation.educationLevel ? latestProfileEducation.educationLevel
@ -4627,9 +4627,7 @@ export class ProfileEmployeeController extends Controller {
name: fullName, name: fullName,
birthDate: item.birthDate, birthDate: item.birthDate,
positionLevel: item.posLevelId, positionLevel: item.posLevelId,
positionLevelName: item.posLevel == null && item.posType == null positionLevelName: item.posLevel?.posLevelName,
? null
: `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
positionType: item.posTypeId, positionType: item.posTypeId,
positionTypeName: item.posType?.posTypeName, positionTypeName: item.posType?.posTypeName,
posNo: shortName, posNo: shortName,
@ -4639,7 +4637,9 @@ export class ProfileEmployeeController extends Controller {
posTypeId: item.posTypeId, posTypeId: item.posTypeId,
posTypeName: item.posType?.posTypeName, posTypeName: item.posType?.posTypeName,
posLevelId: item.posLevelId, posLevelId: item.posLevelId,
posLevelName: item.posLevel?.posLevelName, posLevelName: item.posLevel == null && item.posType == null
? null
: `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
educationDegree: educationDegree:
latestProfileEducation != null && latestProfileEducation.educationLevel != null latestProfileEducation != null && latestProfileEducation.educationLevel != null
? latestProfileEducation.educationLevel ? latestProfileEducation.educationLevel