diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 56b07006..c2e37592 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -7564,13 +7564,13 @@ export class CommandController extends Controller {
             //   }
             // }
 
+            // อัพเดท org และ posMasterNo ตลอดไม่ต้องดัก isSit
+            profile.posMasterNo = getPosMasterNo(posMaster);
+            profile.org = getOrgFullName(posMaster);
             // ถ้าไม่ใช่ตำแหน่งนั่งทับ (isSit = false) ถึงจะอัพเดทตำแหน่งในทะเบียนประวัติ
             if (positionNew != null) {
               console.log("[Excexute/CreateOfficerProfile] Final position assignment, isSit:", posMaster.isSit, "positionId:", positionNew.id);
               positionNew.positionIsSelected = true;
-              // อัพเดท org และ posMasterNo ตลอดไม่ต้องดัก isSit
-              profile.posMasterNo = getPosMasterNo(posMaster);
-              profile.org = getOrgFullName(posMaster);
               if (!posMaster.isSit) {
                 profile.posLevelId = positionNew.posLevelId;
                 profile.posTypeId = positionNew.posTypeId;
@@ -7581,10 +7581,10 @@ export class CommandController extends Controller {
                 profile.positionExecutiveField = positionNew.positionExecutiveField ?? null;
                 // profile.dateStart = new Date();
               }
-              await this.profileRepository.save(profile, { data: req });
-              setLogDataDiff(req, { before, after: profile });
               await this.positionRepository.save(positionNew, { data: req });
             }
+            await this.profileRepository.save(profile, { data: req });
+            setLogDataDiff(req, { before, after: profile });
             // await CreatePosMasterHistoryOfficer(posMaster.id, req);
             await CreatePosMasterHistoryOfficer(posMaster.id, req, null, {
               positionId: positionNew?.id,