From 3a4ac309b99c93c5c710a0811a76f1bab6336497 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 11 Jun 2026 23:51:15 +0700
Subject: [PATCH] fixed: #2562

---
 src/controllers/OrganizationController.ts | 27 ++++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index 7f913b35..b324a1c0 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -9123,17 +9123,22 @@ export class OrganizationController extends Controller {
             org: draftPosMaster ? getOrgFullName(draftPosMaster as PosMaster) ?? _null : _null,
           });
         }
-        // ถ้าไม่ใช่ตำแหน่งนั่งทับ (isSit = false) ถึงจะอัพเดทตำแหน่งในทะเบียนประวัติ
-        if (nextHolderId != null && draftPos.positionIsSelected && !draftPosMaster?.isSit) {
-          const existing = profileUpdates.get(nextHolderId) || {};
-          existing.position = draftPos.positionName;
-          existing.posTypeId = draftPos.posTypeId;
-          existing.posLevelId = draftPos.posLevelId;
-          existing.positionField = draftPos.positionField ?? null;
-          existing.posExecutive = (draftPos as any).posExecutive?.posExecutiveName ?? null;
-          existing.positionArea = draftPos.positionArea ?? null;
-          existing.positionExecutiveField = draftPos.positionExecutiveField ?? null;
-          profileUpdates.set(nextHolderId, existing);
+        
+        if (nextHolderId != null && draftPos.positionIsSelected) {
+          // ถ้าไม่ใช่ตำแหน่งนั่งทับ (isSit = false) ถึงจะอัพเดทตำแหน่งในทะเบียนประวัติ
+          if (!draftPosMaster?.isSit) {
+            const existing = profileUpdates.get(nextHolderId) || {};
+            existing.position = draftPos.positionName;
+            existing.posTypeId = draftPos.posTypeId;
+            existing.posLevelId = draftPos.posLevelId;
+            existing.positionField = draftPos.positionField ?? null;
+            existing.posExecutive = (draftPos as any).posExecutive?.posExecutiveName ?? null;
+            existing.positionArea = draftPos.positionArea ?? null;
+            existing.positionExecutiveField = draftPos.positionExecutiveField ?? null;
+            profileUpdates.set(nextHolderId, existing);
+          }
+
+          // ยังบันทึกประวัติคนครอง
           if (draftPosMaster && draftPosMaster.ancestorDNA) {
             // Find the selected position from draft positions
             const selectedPos =