From 3836062c1036f4d868c7b52b2b845f1e182f2a83 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Tue, 25 Feb 2025 18:24:38 +0700
Subject: [PATCH] fix issue #1217

---
 src/controllers/ProfileEmployeeController.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index 0d76392c..9669f637 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -2806,9 +2806,7 @@ export class ProfileEmployeeController extends Controller {
           name: fullName,
           birthDate: item.birthDate,
           positionLevel: item.posLevelId,
-          positionLevelName: item.posLevel == null && item.posType == null
-            ? null
-            : `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
+          positionLevelName: item.posLevel?.posLevelName,
           positionType: item.posTypeId,
           positionTypeName: item.posType?.posTypeName,
           posNo: shortName,
@@ -2838,7 +2836,9 @@ export class ProfileEmployeeController extends Controller {
           posTypeId: item.posTypeId,
           posTypeName: item.posType?.posTypeName,
           posLevelId: item.posLevelId,
-          posLevelName: item.posLevel?.posLevelName,
+          posLevelName: item.posLevel == null && item.posType == null
+            ? null
+            : `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
           educationDegree:
             latestProfileEducation != null && latestProfileEducation.educationLevel != null
               ? latestProfileEducation.educationLevel
@@ -4627,9 +4627,7 @@ export class ProfileEmployeeController extends Controller {
           name: fullName,
           birthDate: item.birthDate,
           positionLevel: item.posLevelId,
-          positionLevelName: item.posLevel == null && item.posType == null
-            ? null
-            : `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
+          positionLevelName: item.posLevel?.posLevelName,
           positionType: item.posTypeId,
           positionTypeName: item.posType?.posTypeName,
           posNo: shortName,
@@ -4639,7 +4637,9 @@ export class ProfileEmployeeController extends Controller {
           posTypeId: item.posTypeId,
           posTypeName: item.posType?.posTypeName,
           posLevelId: item.posLevelId,
-          posLevelName: item.posLevel?.posLevelName,
+          posLevelName: item.posLevel == null && item.posType == null
+            ? null
+            : `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
           educationDegree:
             latestProfileEducation != null && latestProfileEducation.educationLevel != null
               ? latestProfileEducation.educationLevel