diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts index a9b68243..46665d7b 100644 --- a/src/controllers/OrganizationDotnetController.ts +++ b/src/controllers/OrganizationDotnetController.ts @@ -4225,7 +4225,7 @@ export class OrganizationDotnetController extends Controller { retireDate: profile.birthDate ? calculateRetireLaw(profile.birthDate) : "-", govAge: profile.dateAppoint ? `${Extension.CalculateGovAge(profile.dateAppoint, 0, 0)} ปี` : "-", age: profile.birthDate ? Extension.CalculateAgeStrV2(profile.birthDate, 0, 0) : "-", - dateAppoint: profile.dateAppoint ?? "-", + dateAppoint: profile.dateAppoint, dateCurrent: new Date(), amount: profile.amount ?? "-", telephoneNumber: profile.telephoneNumber ?? "-", @@ -4296,7 +4296,7 @@ export class OrganizationDotnetController extends Controller { educationLevel: x.educationLevel, institute: x.institute ?? "-", country: x.country ?? "-", - finishDate: x.finishDate ?? "-", + finishDate: x.finishDate, })) : [] }; @@ -4329,7 +4329,7 @@ export class OrganizationDotnetController extends Controller { retireDate: profile.birthDate ? calculateRetireLaw(profile.birthDate) : "-", govAge: profile.dateAppoint ? `${Extension.CalculateGovAge(profile.dateAppoint, 0, 0)} ปี` : "-", age: profile.birthDate ? Extension.CalculateAgeStrV2(profile.birthDate, 0, 0) : "-", - dateAppoint: profile.dateAppoint ?? "-", + dateAppoint: profile.dateAppoint, dateCurrent: new Date(), amount: profile.amount ?? "-", telephoneNumber: profile.telephoneNumber ?? "-", @@ -4398,7 +4398,7 @@ export class OrganizationDotnetController extends Controller { educationLevel: x.educationLevel, institute: x.institute ?? "-", country: x.country ?? "-", - finishDate: x.finishDate ?? "-", + finishDate: x.finishDate, })) : [] };