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