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

fix issue #1184 รายการปรับระดับชั้นงาน+ย้าย (ตัวย่อระดับชั้นงานแสดงไม่ครบ)

Browse source
This commit is contained in:
Bright 2025-02-11 19:53:28 +07:00
parent 7878d912b1
commit 86b1e55aee
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/PositionController.ts
View file

@ -4383,7 +4383,9 @@ export class PositionController extends Controller {
posTypeId: position.posTypeId, posTypeId: position.posTypeId,
posTypeName: position.posType == null ? null : position.posType.posTypeName, posTypeName: position.posType == null ? null : position.posType.posTypeName,
posLevelId: position.posLevelId, posLevelId: position.posLevelId,
posLevelName: position.posLevel == null ? null : position.posLevel.posLevelName, posLevelName: position.posType == null && position.posLevel == null
? null
: `${position.posType.posTypeShortName} ${position.posLevel.posLevelName}`,
// posExecutiveId: position.posExecutiveId, // posExecutiveId: position.posExecutiveId,
// posExecutiveName: // posExecutiveName:
// position.posExecutive == null ? null : position.posExecutive.posExecutiveName, // position.posExecutive == null ? null : position.posExecutive.posExecutiveName,

4
src/controllers/ProfileController.ts
View file

@ -6641,9 +6641,9 @@ export class ProfileController extends Controller {
position: profile.position, position: profile.position,
leaveDate: profile.dateLeave, leaveDate: profile.dateLeave,
posMasterNo: posMaster == null ? null : posMaster.posMasterNo, posMasterNo: posMaster == null ? null : posMaster.posMasterNo,
posLevelName: profile.posLevel == null posLevelName: profile.posType == null && profile.posLevel == null
? null ? null
: `${profile.posType.posTypeShortName ?? ""} ${profile.posLevel.posLevelName ?? ""}`, : `${profile.posType.posTypeShortName} ${profile.posLevel.posLevelName}`,
posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank, posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank,
posLevelId: profile.posLevel == null ? null : profile.posLevel.id, posLevelId: profile.posLevel == null ? null : profile.posLevel.id,
posTypeName: profile.posType == null ? null : profile.posType.posTypeName, posTypeName: profile.posType == null ? null : profile.posType.posTypeName,