diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index fc3abee5..75fb5724 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -486,7 +486,7 @@ export class ProfileController extends Controller { ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}` : "", Level: item.educationLevel ?? "", - Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "", + Degree: item.degree ? `${item.degree} ${item.field ? item.field : "" }`: "", Field: item.field ?? "-", })); const salarys = await this.salaryRepository.find({ diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 50faddd6..940060a5 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -481,7 +481,7 @@ export class ProfileEmployeeController extends Controller { ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}` : "", Level: item.educationLevel ?? "", - Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "", + Degree: item.degree ? `${item.degree} ${item.field ? item.field : "" }`: "", Field: item.field ?? "-", })); const salarys = await this.salaryRepository.find({