From 32a936c090fad023aa4c30058489c0a97e8664b5 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Mon, 10 Mar 2025 12:12:22 +0700
Subject: [PATCH] no message

---
 src/controllers/ReportController.ts | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 212dac51..e91bc9da 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -319,11 +319,11 @@ export class ReportController extends Controller {
               (i: any) => i.isHigh === true 
             )
           : []
-          if(_educations.length == 0) {
-            _educations = Array.isArray(x.Educations) && x.Educations != null
-            ? (x.Educations as any[])[0] 
-            : []
-          }
+          // if(_educations.length == 0) {
+          //   _educations = Array.isArray(x.Educations) && x.Educations != null
+          //   ? (x.Educations as any[])[0] 
+          //   : []
+          // }
         }
       }
       else {
@@ -370,10 +370,10 @@ export class ReportController extends Controller {
         dateRetire: x.dateRetire,
         dateRetireLaw: x.dateRetireLaw,
         birthdate: x.birthdate,
-        education: _educations,
-        degree: x.degrees,
-        educationLevel: x.educationLevels,
-        field: x.fields,
+        Educations: _educations,
+        // degree: x.degrees,
+        // educationLevel: x.educationLevels,
+        // field: x.fields,
         age: x.age,
         currentPosition: null,
         lengthPosition: null,
@@ -602,11 +602,11 @@ export class ReportController extends Controller {
                 (i: any) => i.isHigh === true 
               )
             : []
-            if(_educations.length == 0) {
-              _educations = Array.isArray(x.Educations) && x.Educations != null
-              ? (x.Educations as any[])[0] 
-              : []
-            }
+            // if(_educations.length == 0) {
+            //   _educations = Array.isArray(x.Educations) && x.Educations != null
+            //   ? (x.Educations as any[])[0] 
+            //   : []
+            // }
           }
         }
         else {
@@ -651,10 +651,10 @@ export class ReportController extends Controller {
           dateRetire: x.dateRetire,
           dateRetireLaw: x.dateRetireLaw,
           birthdate: x.birthdate,
-          education: _educations,
-          degree: x.degrees,
-          educationLevel: x.educationLevels,
-          field: x.fields,
+          Educations:  _educations != null ? _educations : [],
+          // degree: x.degrees,
+          // educationLevel: x.educationLevels,
+          // field: x.fields,
           age: x.age,
           currentPosition: null,
           lengthPosition: null,