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,