hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fixed: #2562
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m3s
Details

Browse source
This commit is contained in:
Warunee Tamkoo 2026-06-11 23:51:15 +07:00
parent 1e69cf6bb7
commit 3a4ac309b9
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/controllers/OrganizationController.ts
View file

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