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 1/2] #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"],

From 4e0aa32f7f14b91f8d2a297d87bce7fa8d70de9d Mon Sep 17 00:00:00 2001
From: mamoss <>
Date: Wed, 23 Jul 2025 15:06:50 +0700
Subject: [PATCH 2/2] import mis

---
 src/controllers/ImportDataController.ts  |  6 +++---
 src/entities/HR_POSITION_EMPLOYEETEMP.ts | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/controllers/ImportDataController.ts b/src/controllers/ImportDataController.ts
index 25532954..dc3dc2e2 100644
--- a/src/controllers/ImportDataController.ts
+++ b/src/controllers/ImportDataController.ts
@@ -1925,9 +1925,9 @@ export class ImportDataController extends Controller {
         //     ? _null
         //     : Number(item.SAL_POS_AMOUNT_2);
         // profileSalary.positionSalaryAmount = sal_pos_amount_1 ?? sal_pos_amount_2;
-        const special_amt: any =
-          item.SPECIAL_AMT == null || item.SPECIAL_AMT == "" ? _null : Number(item.SPECIAL_AMT);
-        profileSalary.amountSpecial = special_amt;
+        // const special_amt: any =
+        //   item.SPECIAL_AMT == null || item.SPECIAL_AMT == "" ? _null : Number(item.SPECIAL_AMT);
+        // profileSalary.amountSpecial = special_amt;
         profileSalary.posNumCodeSit = item.POS_NUM_CODE_SIT;
         profileSalary.posNumCodeSitAbb = item.POS_NUM_CODE_SIT_ABB;
 
diff --git a/src/entities/HR_POSITION_EMPLOYEETEMP.ts b/src/entities/HR_POSITION_EMPLOYEETEMP.ts
index 170db661..fd4d4d15 100644
--- a/src/entities/HR_POSITION_EMPLOYEETEMP.ts
+++ b/src/entities/HR_POSITION_EMPLOYEETEMP.ts
@@ -189,12 +189,12 @@ export class HR_POSITION_EMPLOYEETEMP {
   // })
   // SAL_POS_AMOUNT_2: string;
 
-  @Column({
-    nullable: true,
-    type: "text",
-    default: null,
-  })
-  SPECIAL_AMT: string;
+  // @Column({
+  //   nullable: true,
+  //   type: "text",
+  //   default: null,
+  // })
+  // SPECIAL_AMT: string;
 
   @Column({
     nullable: true,