From 54a96ac7c9296be95c9d1a73c3dc307446053548 Mon Sep 17 00:00:00 2001
From: adisak <t99m2018@gmail.com>
Date: Wed, 23 Jul 2025 14:58:28 +0700
Subject: [PATCH] #1393

---
 src/services/rabbitmq.ts | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts
index 6f379825..e1392178 100644
--- a/src/services/rabbitmq.ts
+++ b/src/services/rabbitmq.ts
@@ -532,7 +532,17 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
             ? x.id
             : x.ancestorDNA,
       }));
-      await repoEmployeePosmaster.save(_orgemployeePosMaster);
+      // await repoEmployeePosmaster.save(_orgemployeePosMaster);
+      await repoEmployeePosmaster
+      .createQueryBuilder()
+      .insert()
+      .into(EmployeePosMaster)
+      .values(_orgemployeePosMaster)
+      .orUpdate({
+        conflict_target: ['id'],
+        overwrite: ['ancestorDNA'],
+      })
+      .execute();
 
       //   }
       //หา dna posmaster ถ้าไม่มีให้เอาตัวเองเป็น dna
@@ -555,9 +565,19 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
             ? x.id
             : x.ancestorDNA,
       }));
-      await repoEmployeeTempPosmaster.save(_orgemployeeTempPosMaster);
+      // await repoEmployeeTempPosmaster.save(_orgemployeeTempPosMaster);
+      await repoEmployeeTempPosmaster
+      .createQueryBuilder()
+      .insert()
+      .into(EmployeeTempPosMaster)
+      .values(_orgemployeeTempPosMaster)
+      .orUpdate({
+        conflict_target: ['id'],
+        overwrite: ['ancestorDNA'],
+      })
+      .execute();
       //   }
-
+      
       //create org
       orgRoot.forEach(async (x: any) => {
         var dataId = x.id;
@@ -1364,7 +1384,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
           });
       });
       // }
-
+      
       const employeePosMaster = await repoEmployeePosmaster.find({
         where: { orgRevisionId: orgRevisionDraft.id },
         relations: ["positions", "positions.posLevel", "positions.posType"],