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

add field commandDate & education

Browse source
This commit is contained in:
Bright 2024-11-08 12:11:01 +07:00
parent fb40df8a2a
commit 6d13f7b598
4 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/controllers/ProfileEmployeeController.ts
View file

@ -3833,11 +3833,15 @@ export class ProfileEmployeeController extends Controller {
"current_holders",
"current_holders.orgRoot",
"profileSalary",
"profileEducations"
],
order: {
profileSalary: {
order: "DESC",
},
// profileSalary: {
// order: "DESC",
// },
profileEducations: {
createdAt: "DESC"
}
},
});
if (!profile) {
@ -3961,6 +3965,9 @@ export class ProfileEmployeeController extends Controller {
posNo: shortName,
salary:
profile && profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null,
education: profile && profile.profileEducations.length > 0
? `${profile.profileEducations[0].degree ?? ""}-${profile.profileEducations[0].field ?? ""}`
: "-"
};
if (_profile.child4Id != null) {