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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-12-26 19:33:54 +07:00
commit 7e31c22f79
5 changed files with 42 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/ProfileController.ts
View file

@ -4857,6 +4857,9 @@ export class ProfileController extends Controller {
nodeId: null,
type: profile.employeeClass,
salary: profile.amount,
posNo : root?.orgRootShortName && posMaster?.posMasterNo
? `${root?.orgRootShortName}${posMaster?.posMasterNo}`
: ""
};
if (_profile.child4Id != null) {
_profile.node = 4;
@ -4998,6 +5001,9 @@ export class ProfileController extends Controller {
nodeId: null,
salary: profile ? profile.amount : null,
amountSpecial: profile ? profile.amountSpecial : null,
posNo : root?.orgRootShortName && posMaster?.posMasterNo
? `${root?.orgRootShortName}${posMaster?.posMasterNo}`
: ""
};
if (_profile.child4Id != null) {