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-11-18 10:29:46 +07:00
commit 01f2066075
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/ProfileController.ts
View file

@ -4569,8 +4569,7 @@ export class ProfileController extends Controller {
node: null,
nodeId: null,
type: profile.employeeClass,
salary:
profile && profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null,
salary: profile.amount,
};
if (_profile.child4Id != null) {
_profile.node = 4;

4
src/controllers/ProfileEmployeeController.ts
View file

@ -1970,7 +1970,7 @@ export class ProfileEmployeeController extends Controller {
child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
node: null,
nodeId: null,
salary: profile && profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null,
salary: profile.amount,
};
return new HttpSuccess(_profile);
}
@ -3970,7 +3970,7 @@ export class ProfileEmployeeController extends Controller {
node: null,
nodeId: null,
posNo: shortName,
salary: profile && profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null,
salary: profile.amount,
education:
profile && profile.profileEducations.length > 0
? `${profile.profileEducations[0].degree ?? ""}/${profile.profileEducations[0].field ?? ""}`

2
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1861,7 +1861,7 @@ export class ProfileEmployeeTempController extends Controller {
? null
: profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4
.orgChild4Name,
salary: profile && profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null,
salary: profile.amount,
};
return new HttpSuccess(_profile);
}