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

แก้วุฒิ/สาขา

Browse source
This commit is contained in:
Bright 2024-11-14 17:29:54 +07:00
parent ff49b53713
commit efff0bf99f
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/controllers/ProfileController.ts
View file

@ -5491,7 +5491,7 @@ export class ProfileController extends Controller {
salary: profile ? profile.amount : null, salary: profile ? profile.amount : null,
education: education:
profile && profile.profileEducations.length > 0 profile && profile.profileEducations.length > 0
? `${profile.profileEducations[0].degree ?? ""}-${profile.profileEducations[0].field ?? ""}` ? `${profile.profileEducations[0].degree ?? ""}/${profile.profileEducations[0].field ?? ""}`
: "-", : "-",
}; };
@ -5695,7 +5695,13 @@ export class ProfileController extends Controller {
"current_holders.orgChild2", "current_holders.orgChild2",
"current_holders.orgChild3", "current_holders.orgChild3",
"current_holders.orgChild4", "current_holders.orgChild4",
"profileEducations",
], ],
order: {
profileEducations: {
createdAt: "DESC",
},
},
}); });
if (!profile) { if (!profile) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ"); throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
@ -5779,6 +5785,9 @@ export class ProfileController extends Controller {
child4ShortName: child4 == null ? null : child4.orgChild4ShortName, child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
node: null, node: null,
nodeId: null, nodeId: null,
education: profile && profile.profileEducations.length > 0
? `${profile.profileEducations[0].degree ?? ""}/${profile.profileEducations[0].field ?? ""}`
: "-",
}; };
if (_profile.child4Id != null) { if (_profile.child4Id != null) {

2
src/controllers/ProfileEmployeeController.ts
View file

@ -3989,7 +3989,7 @@ export class ProfileEmployeeController extends Controller {
salary: salary:
profile && profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null, profile && profile.profileSalary.length > 0 ? profile.profileSalary[0].amount : null,
education: profile && profile.profileEducations.length > 0 education: profile && profile.profileEducations.length > 0
? `${profile.profileEducations[0].degree ?? ""}-${profile.profileEducations[0].field ?? ""}` ? `${profile.profileEducations[0].degree ?? ""}/${profile.profileEducations[0].field ?? ""}`
: "-" : "-"
}; };

2
src/controllers/ProfileEmployeeTempController.ts
View file

@ -3580,7 +3580,7 @@ export class ProfileEmployeeTempController extends Controller {
nodeId: null, nodeId: null,
posNo: shortName, posNo: shortName,
education: profile && profile.profileEducations.length > 0 education: profile && profile.profileEducations.length > 0
? `${profile.profileEducations[0].degree ?? ""}-${profile.profileEducations[0].field ?? ""}` ? `${profile.profileEducations[0].degree ?? ""}/${profile.profileEducations[0].field ?? ""}`
: "-" : "-"
}; };