From 922a0ab1c276f24e1242ca105ffab0e7eab1b2f3 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 6 Feb 2026 22:11:07 +0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B8=8A=E0=B9=88=E0=B8=A7=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B8=A3=E0=B8=B1=E0=B8=81=E0=B8=A9=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=20endDate=20null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ProfileSalaryTempController.ts | 4 ++--
 src/entities/ProfileActposition.ts             | 2 +-
 src/entities/ProfileAssistance.ts              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/controllers/ProfileSalaryTempController.ts b/src/controllers/ProfileSalaryTempController.ts
index d0458f15..6ea1713c 100644
--- a/src/controllers/ProfileSalaryTempController.ts
+++ b/src/controllers/ProfileSalaryTempController.ts
@@ -1430,7 +1430,7 @@ export class ProfileSalaryTempController extends Controller {
               profileId: x.profileId,
               profileEmployeeId: x.profileEmployeeId,
               dateStart: x.commandDateAffect,
-              dateEnd: x.commandDateAffect,
+              dateEnd: null,
               posNo: x.posNo,
               position: x.positionName,
               commandId: x.commandId,
@@ -1452,7 +1452,7 @@ export class ProfileSalaryTempController extends Controller {
               profileEmployeeId: x.profileEmployeeId,
               agency: x.orgRoot,
               dateStart: x.commandDateAffect,
-              dateEnd: x.commandDateAffect,
+              dateEnd: null,
               commandId: x.commandId,
               commandNo: x.commandNo,
               commandName: x.commandName,
diff --git a/src/entities/ProfileActposition.ts b/src/entities/ProfileActposition.ts
index 4d20c0d8..bde07e30 100644
--- a/src/entities/ProfileActposition.ts
+++ b/src/entities/ProfileActposition.ts
@@ -29,7 +29,7 @@ export class ProfileActposition extends EntityBase {
     comment: "วันที่สิ้นสุด",
     default: null,
   })
-  dateEnd: Date;
+  dateEnd: Date | null;
 
   @Column({
     nullable: true,
diff --git a/src/entities/ProfileAssistance.ts b/src/entities/ProfileAssistance.ts
index 568552c0..ad01f585 100644
--- a/src/entities/ProfileAssistance.ts
+++ b/src/entities/ProfileAssistance.ts
@@ -43,7 +43,7 @@ export class ProfileAssistance extends EntityBase {
     comment: "วันสิ้นสุดการช่วยราชการ",
     default: null,
   })
-  dateEnd: Date;
+  dateEnd: Date | null;
 
   @Column({
     nullable: true,