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(() => {