From fa2d922fc3db59f6e609fb94c4165a4e18d774ca Mon Sep 17 00:00:00 2001
From: Adisak <adisak@frappet.com>
Date: Wed, 27 May 2026 14:24:32 +0700
Subject: [PATCH] #2529 , #2533

---
 src/controllers/CommandController.ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 824773f1..24935202 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -7006,7 +7006,7 @@ export class CommandController extends Controller {
           profile.currentSubDistrictId = currentSubDistrictId ? currentSubDistrictId.id : _null;
           profile.currentZipCode = item.bodyProfile.currentZipCode;
           profile.email = item.bodyProfile.email;
-          profile.dateStart = item.bodyProfile.dateStart;
+          profile.dateStart = item.bodySalarys?.commandDateAffect ?? item.bodyProfile.dateStart;
           profile.amount = item.bodyProfile.amount ?? null;
           profile.amountSpecial = item.bodyProfile.amountSpecial ?? null;
           profile.isProbation = item.bodyProfile.isProbation;
@@ -7076,7 +7076,7 @@ export class CommandController extends Controller {
             profile.currentSubDistrictId = currentSubDistrictId ? currentSubDistrictId.id : _null;
             profile.currentZipCode = item.bodyProfile.currentZipCode;
             profile.email = item.bodyProfile.email;
-            profile.dateStart = item.bodyProfile.dateStart;
+            profile.dateStart = item.bodySalarys?.commandDateAffect ?? item.bodyProfile.dateStart;
             profile.amount = item.bodyProfile.amount ?? null;
             profile.amountSpecial = item.bodyProfile.amountSpecial ?? null;
             profile.isProbation = item.bodyProfile.isProbation;
@@ -7128,7 +7128,7 @@ export class CommandController extends Controller {
             profile.email = item.bodyProfile.email;
             profile.telephoneNumber = item.bodyProfile.telephoneNumber;
             profile.phone = item.bodyProfile.phone;
-            profile.dateStart = item.bodyProfile.dateStart;
+            profile.dateStart = item.bodySalarys?.commandDateAffect ?? item.bodyProfile.dateStart;
             profile.amount = item.bodyProfile.amount ?? null;
             profile.amountSpecial = item.bodyProfile.amountSpecial ?? null;
             profile.leaveCommandId = _null;
@@ -7578,6 +7578,15 @@ export class CommandController extends Controller {
                 // profile.dateStart = new Date();
               }
               await this.positionRepository.save(positionNew, { data: req });
+            } else if (!posMaster.isSit) {
+              // fallback: ตำแหน่งในโครงสร้างถูกแก้ไข ใช้ข้อมูลตำแหน่งที่สมัครสอบมา
+              console.log("[Excexute/CreateOfficerProfile] positionNew is null, using bodyPosition data as fallback");
+              profile.position = item.bodyPosition.positionName ?? null;
+              profile.posTypeId = item.bodyPosition.posTypeId ?? null;
+              profile.posLevelId = item.bodyPosition.posLevelId ?? null;
+              profile.positionField = item.bodyPosition.positionField ?? null;
+              profile.positionArea = item.bodyPosition.positionArea ?? null;
+              profile.positionExecutiveField = item.bodyPosition.positionExecutiveField ?? null;
             }
             await this.profileRepository.save(profile, { data: req });
             setLogDataDiff(req, { before, after: profile });