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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
Kittapath 2024-04-30 18:00:55 +07:00
commit a03b23ce35
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/controllers/PositionController.ts
View file

@ -1611,6 +1611,7 @@ export class PositionController extends Controller {
orgRootId: org.id, orgRootId: org.id,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
orgChild1Id: IsNull() || "", orgChild1Id: IsNull() || "",
id: Not(In(requestBody.positionMaster))
}, },
}); });
if (_posMaster != null) if (_posMaster != null)
@ -1645,6 +1646,7 @@ export class PositionController extends Controller {
orgChild1Id: org.id, orgChild1Id: org.id,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
orgChild2Id: IsNull() || "", orgChild2Id: IsNull() || "",
id: Not(In(requestBody.positionMaster))
}, },
}); });
if (_posMaster != null) if (_posMaster != null)
@ -1678,6 +1680,7 @@ export class PositionController extends Controller {
orgChild2Id: org.id, orgChild2Id: org.id,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
orgChild3Id: IsNull() || "", orgChild3Id: IsNull() || "",
id: Not(In(requestBody.positionMaster))
}, },
}); });
if (_posMaster != null) if (_posMaster != null)
@ -1710,6 +1713,7 @@ export class PositionController extends Controller {
orgChild3Id: org.id, orgChild3Id: org.id,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
orgChild4Id: IsNull() || "", orgChild4Id: IsNull() || "",
id: Not(In(requestBody.positionMaster))
}, },
}); });
if (_posMaster != null) if (_posMaster != null)
@ -1736,6 +1740,7 @@ export class PositionController extends Controller {
where: { where: {
orgChild4Id: org.id, orgChild4Id: org.id,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
id: Not(In(requestBody.positionMaster))
}, },
}); });
if (_posMaster != null) if (_posMaster != null)
@ -1754,7 +1759,7 @@ export class PositionController extends Controller {
} }
} }
//CheckAll //Check All Branch
const orgRevision = await this.orgRevisionRepository.findOne({ const orgRevision = await this.orgRevisionRepository.findOne({
where: { where: {
orgRevisionIsDraft: true, orgRevisionIsDraft: true,
@ -1776,6 +1781,7 @@ export class PositionController extends Controller {
orgRootId: r.id, orgRootId: r.id,
orgChild1Id: IsNull() || "", orgChild1Id: IsNull() || "",
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
id: Not(In(requestBody.positionMaster))
}, },
}); });
if (_posMasterRoot != null) { if (_posMasterRoot != null) {
@ -1802,6 +1808,7 @@ export class PositionController extends Controller {
orgChild1Id: c1.id, orgChild1Id: c1.id,
orgChild2Id: IsNull() || "", orgChild2Id: IsNull() || "",
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
id: Not(In(requestBody.positionMaster))
}, },
}); });
if (_posMasterChild1 != null) { if (_posMasterChild1 != null) {
@ -1828,6 +1835,7 @@ export class PositionController extends Controller {
orgChild2Id: c2.id, orgChild2Id: c2.id,
orgChild3Id: IsNull() || "", orgChild3Id: IsNull() || "",
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
id: Not(In(requestBody.positionMaster))
}, },
}); });
if (_posMasterChild2 != null) { if (_posMasterChild2 != null) {
@ -1854,6 +1862,7 @@ export class PositionController extends Controller {
orgChild3Id: c3.id, orgChild3Id: c3.id,
orgChild4Id: IsNull() || "", orgChild4Id: IsNull() || "",
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
id: Not(In(requestBody.positionMaster))
}, },
}); });
if (_posMasterChild3 != null) { if (_posMasterChild3 != null) {
@ -1879,6 +1888,7 @@ export class PositionController extends Controller {
orgRevisionId: orgRevision?.id, orgRevisionId: orgRevision?.id,
orgChild4Id: c4.id, orgChild4Id: c4.id,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
id: Not(In(requestBody.positionMaster))
}, },
}); });
if (_posMasterChild4 != null) { if (_posMasterChild4 != null) {