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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
kittapath 2024-11-18 14:34:14 +07:00
commit 3c9698f606
3 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/controllers/ProfileController.ts
View file

@ -5782,6 +5782,7 @@ export class ProfileController extends Controller {
child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
node: null,
nodeId: null,
salary: profile.amount,
education:
profile && profile.profileEducations.length > 0
? `${profile.profileEducations[0].degree ?? ""}/${profile.profileEducations[0].field ?? ""}`

1
src/controllers/ProfileEmployeeTempController.ts
View file

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