From 037934f0eb28ecd44fc9c10b6ce4603f2c53d488 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Tue, 2 Apr 2024 14:26:35 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=8A=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=A2=E0=B9=88=E0=B8=AD=E0=B8=81=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B8=E0=B9=88=E0=B8=A1=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/EmployeePositionController.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts
index 8b728e7b..68a564c0 100644
--- a/src/controllers/EmployeePositionController.ts
+++ b/src/controllers/EmployeePositionController.ts
@@ -335,10 +335,10 @@ export class EmployeePositionController extends Controller {
           id: item.id,
           posDictName: item.posDictName,
           posTypeId: item.posTypeId,
-          posTypeName: `${posTypeShortName} ${posTypeName}`,
+          posTypeName: posTypeName,
           posTypeShortName: posTypeShortName,
           posLevelId: item.posLevelId,
-          posLevelName: posLevelName,
+          posLevelName: `${posTypeShortName} ${posLevelName}`,
         };
       }),
     );
@@ -1143,7 +1143,10 @@ export class EmployeePositionController extends Controller {
             posTypeName: position.posType == null ? null : position.posType.posTypeName,
             posTypeShortName: position.posType == null ? null : position.posType.posTypeShortName,
             posLevelId: position.posLevelId,
-            posLevelName: position.posLevel == null ? null : position.posLevel.posLevelName,
+            posLevelName:
+              position.posLevel == null || position.posType == null
+                ? null
+                : `${position.posType.posTypeShortName} ${position.posLevel.posLevelName}`,
             positionIsSelected: position.positionIsSelected,
           })),
         };