From 08a9f755c7d5ee20b7db6fee84b415860485c5d9 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Thu, 19 Jun 2025 10:30:55 +0700
Subject: [PATCH] =?UTF-8?q?Fix=20Invalid=20=E0=B8=A3=E0=B8=B2=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=9C=E0=B8=A5=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=9A=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=9A=E0=B8=B8?=
 =?UTF-8?q?=E0=B8=84=E0=B8=84=E0=B8=A5=20(KPI)=20=E0=B9=84=E0=B8=A1?=
 =?UTF-8?q?=E0=B9=88=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=95=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=AA=E0=B8=B4=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C?=
 =?UTF-8?q?=20#19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/KpiUserDevelopmentController.ts |  4 ++--
 src/controllers/KpiUserEvaluationController.ts  | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/controllers/KpiUserDevelopmentController.ts b/src/controllers/KpiUserDevelopmentController.ts
index 8b71573..7533a7d 100644
--- a/src/controllers/KpiUserDevelopmentController.ts
+++ b/src/controllers/KpiUserDevelopmentController.ts
@@ -377,8 +377,8 @@ export class KpiUserDevelopmentController extends Controller {
       .andWhere(
         _data.root != undefined && _data.root != null
           ? _data.root[0] != null
-            ? `kpiUserEvaluation.rootDnaId IN (:...root)`
-            : `kpiUserEvaluation.rootDnaId is null`
+            ? `kpiUserEvaluation.orgDnaId IN (:...root)`
+            : `kpiUserEvaluation.orgDnaId is null`
           : "1=1",
         {
           root: _data.root,
diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts
index e97caa6..d0153e7 100644
--- a/src/controllers/KpiUserEvaluationController.ts
+++ b/src/controllers/KpiUserEvaluationController.ts
@@ -607,6 +607,11 @@ export class KpiUserEvaluationController extends Controller {
           kpiUserEvaluation.child3Id = x.child3Id;
           kpiUserEvaluation.child4 = x.child4;
           kpiUserEvaluation.child4Id = x.child4Id;
+          kpiUserEvaluation.orgDnaId = x.rootDnaId;
+          kpiUserEvaluation.child1DnaId = x.child1DnaId;
+          kpiUserEvaluation.child2DnaId = x.child2DnaId;
+          kpiUserEvaluation.child3DnaId = x.child3DnaId;
+          kpiUserEvaluation.child4DnaId = x.child4DnaId;
           isProbation = x.isProbation;
         })
         .catch(() => {
@@ -635,6 +640,11 @@ export class KpiUserEvaluationController extends Controller {
           kpiUserEvaluation.child3Id = x.child3Id;
           kpiUserEvaluation.child4 = x.child4;
           kpiUserEvaluation.child4Id = x.child4Id;
+          kpiUserEvaluation.orgDnaId = x.rootDnaId;
+          kpiUserEvaluation.child1DnaId = x.child1DnaId;
+          kpiUserEvaluation.child2DnaId = x.child2DnaId;
+          kpiUserEvaluation.child3DnaId = x.child3DnaId;
+          kpiUserEvaluation.child4DnaId = x.child4DnaId;
           isProbation = x.isProbation;
         })
         .catch(() => {