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

Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
Adisak 2026-01-05 11:36:21 +07:00
commit 0cd6926101
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/services/PositionService.ts
View file

@ -41,7 +41,7 @@ export async function CreatePosMasterHistoryOfficer(
if (!pm.ancestorDNA) return false;
const checkCurrentRevision = await repoOrgRevision.findOne({
where:{
where: {
id: pm.orgRevisionId,
orgRevisionIsCurrent: true,
orgRevisionIsDraft: false
@ -54,12 +54,18 @@ export async function CreatePosMasterHistoryOfficer(
? pm.positions.find((p) => p.positionIsSelected === true) ?? null
: null;
h.ancestorDNA = pm.ancestorDNA ? pm.ancestorDNA : _null;
if(!type || type != "DELETE"){
if(checkCurrentRevision){
if (!type || type != "DELETE") {
if (checkCurrentRevision) {
h.prefix = pm.current_holder?.prefix || _null;
h.firstName = pm.current_holder?.firstName || _null;
h.lastName = pm.current_holder?.lastName || _null;
}else{
h.profileId = pm.current_holder?.id || _null;
h.rootDnaId = pm.orgRoot.ancestorDNA || _null;
h.child1DnaId = pm.orgChild1.ancestorDNA || _null;
h.child2DnaId = pm.orgChild2.ancestorDNA || _null;
h.child3DnaId = pm.orgChild3.ancestorDNA || _null;
h.child4DnaId = pm.orgChild4.ancestorDNA || _null;
} else {
h.prefix = pm.next_holder?.prefix || _null;
h.firstName = pm.next_holder?.firstName || _null;
h.lastName = pm.next_holder?.lastName || _null;