From 031ee3fe51f92d423ae95a1fb8dc92b44a314a29 Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 13 Aug 2024 10:50:31 +0700 Subject: [PATCH] =?UTF-8?q?fix=20report=20=E0=B8=81=E0=B8=9E.7/=E0=B8=81?= =?UTF-8?q?=E0=B8=81.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 2 +- src/controllers/ProfileEmployeeController.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index df343da9..8adcfa9d 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 87214166..307e4fb5 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({