From f790fa72cba0e75a984a596c509e8288715c094c Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Tue, 29 Apr 2025 17:15:35 +0700
Subject: [PATCH] =?UTF-8?q?[Bug=20=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87]=20?=
 =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=95=E0=B8=B3?=
 =?UTF-8?q?=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87=20#117?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/EmployeePositionController.ts | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts
index 4b6ef89f..861a9247 100644
--- a/src/controllers/EmployeePositionController.ts
+++ b/src/controllers/EmployeePositionController.ts
@@ -572,7 +572,7 @@ export class EmployeePositionController extends Controller {
     const chk_SName0 = await this.employeePosMasterRepository.findOne({
       where: {
         orgRevisionId: posMaster.orgRevisionId,
-        orgRoot: { orgRootShortName: SName },
+        orgRoot: { orgRootShortName: SName, id: requestBody.orgRootId ?? "" },
         orgChild1Id: IsNull(),
         posMasterNo: requestBody.posMasterNo,
       },
@@ -588,7 +588,7 @@ export class EmployeePositionController extends Controller {
     const chk_SName1 = await this.employeePosMasterRepository.findOne({
       where: {
         orgRevisionId: posMaster.orgRevisionId,
-        orgChild1: { orgChild1ShortName: SName },
+        orgChild1: { orgChild1ShortName: SName, id: requestBody.orgChild1Id ?? "" },
         orgChild2Id: IsNull(),
         posMasterNo: requestBody.posMasterNo,
       },
@@ -604,7 +604,7 @@ export class EmployeePositionController extends Controller {
     const chk_SName2 = await this.employeePosMasterRepository.findOne({
       where: {
         orgRevisionId: posMaster.orgRevisionId,
-        orgChild2: { orgChild2ShortName: SName },
+        orgChild2: { orgChild2ShortName: SName, id: requestBody.orgChild2Id ?? "" },
         orgChild3Id: IsNull(),
         posMasterNo: requestBody.posMasterNo,
       },
@@ -620,7 +620,7 @@ export class EmployeePositionController extends Controller {
     const chk_SName3 = await this.employeePosMasterRepository.findOne({
       where: {
         orgRevisionId: posMaster.orgRevisionId,
-        orgChild3: { orgChild3ShortName: SName },
+        orgChild3: { orgChild3ShortName: SName, id: requestBody.orgChild3Id ?? "" },
         orgChild4Id: IsNull(),
         posMasterNo: requestBody.posMasterNo,
       },
@@ -636,7 +636,7 @@ export class EmployeePositionController extends Controller {
     const chk_SName4 = await this.employeePosMasterRepository.findOne({
       where: {
         orgRevisionId: posMaster.orgRevisionId,
-        orgChild4: { orgChild4ShortName: SName },
+        orgChild4: { orgChild4ShortName: SName, id: requestBody.orgChild4Id ?? "" },
         posMasterNo: requestBody.posMasterNo,
       },
       relations: ["orgChild4"],
@@ -780,7 +780,7 @@ export class EmployeePositionController extends Controller {
     const chk_SName0 = await this.employeePosMasterRepository.findOne({
       where: {
         orgRevisionId: posMaster.orgRevisionId,
-        orgRoot: { orgRootShortName: SName },
+        orgRoot: { orgRootShortName: SName, id: requestBody.orgRootId ?? "" },
         orgChild1Id: IsNull(),
         posMasterNo: requestBody.posMasterNo,
         id: Not(posMaster.id),
@@ -797,7 +797,7 @@ export class EmployeePositionController extends Controller {
     const chk_SName1 = await this.employeePosMasterRepository.findOne({
       where: {
         orgRevisionId: posMaster.orgRevisionId,
-        orgChild1: { orgChild1ShortName: SName },
+        orgChild1: { orgChild1ShortName: SName, id: requestBody.orgChild1Id ?? "" },
         orgChild2Id: IsNull(),
         posMasterNo: requestBody.posMasterNo,
         id: Not(posMaster.id),
@@ -814,7 +814,7 @@ export class EmployeePositionController extends Controller {
     const chk_SName2 = await this.employeePosMasterRepository.findOne({
       where: {
         orgRevisionId: posMaster.orgRevisionId,
-        orgChild2: { orgChild2ShortName: SName },
+        orgChild2: { orgChild2ShortName: SName, id: requestBody.orgChild2Id ?? "" },
         orgChild3Id: IsNull(),
         posMasterNo: requestBody.posMasterNo,
         id: Not(posMaster.id),
@@ -831,7 +831,7 @@ export class EmployeePositionController extends Controller {
     const chk_SName3 = await this.employeePosMasterRepository.findOne({
       where: {
         orgRevisionId: posMaster.orgRevisionId,
-        orgChild3: { orgChild3ShortName: SName },
+        orgChild3: { orgChild3ShortName: SName, id: requestBody.orgChild3Id ?? "" },
         orgChild4Id: IsNull(),
         posMasterNo: requestBody.posMasterNo,
         id: Not(posMaster.id),
@@ -848,7 +848,7 @@ export class EmployeePositionController extends Controller {
     const chk_SName4 = await this.employeePosMasterRepository.findOne({
       where: {
         orgRevisionId: posMaster.orgRevisionId,
-        orgChild4: { orgChild4ShortName: SName },
+        orgChild4: { orgChild4ShortName: SName, id: requestBody.orgChild4Id ?? "" },
         posMasterNo: requestBody.posMasterNo,
         id: Not(posMaster.id),
       },