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 
# Conflicts:
#	src/controllers/ProfileEmployeeController.ts
This commit is contained in:
kittapath 2024-11-14 18:05:30 +07:00
commit 1c991a5ad8
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/ProfileEmployeeController.ts
View file

@ -3991,7 +3991,7 @@ export class ProfileEmployeeController extends Controller {
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 ?? ""}`
? `${profile.profileEducations[0].degree ?? ""}/${profile.profileEducations[0].field ?? ""}`
: "-",
};