From c5c588214b5c863395d28b5200b472f50ae033a2 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Tue, 30 Apr 2024 15:21:20 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A2=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/PositionController.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index 46dd1dba..5d93abf3 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) {