From 3451b6014a818b661a10f7e15d50401ce499503b Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 30 Apr 2025 13:57:15 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B0=E0=B8=94=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87=20(=20API=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=E0=B9=83=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=AD=E0=B8=B7=E0=B9=88=E0=B8=99=20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/OrganizationDotnetController.ts | 6 +++---
 src/controllers/ProfileEmployeeController.ts    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts
index adabac98..4fc045c7 100644
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@@ -1694,11 +1694,11 @@ export class OrganizationDotnetController extends Controller {
     return new HttpSuccess(mapProfile);
   }
   /**
-   * 3.	API Get Profile จาก keycloak id
+   * 3.	API Get Profile จาก citizen Id
    *
-   * @summary 3. API Get Profile จาก keycloak id
+   * @summary 3. API Get Profile จาก citizen Id
    *
-   * @param {string} citizenId  Id keycloak
+   * @param {string} citizenId  citizen Id
    */
   @Get("citizenId/{citizenId}")
   async GetProfileByCitizenIdAsync(@Path() citizenId: string) {
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index 0a87094c..a92844db 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -1630,7 +1630,7 @@ export class ProfileEmployeeController extends Controller {
           firstName: _data.firstName,
           lastName: _data.lastName,
           citizenId: _data.citizenId,
-          posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName,
+          posLevel: `${_data.posType.posTypeShortName?? ""} ${_data.posLevel.posLevelName ?? ""}`,
           posType: _data.posType == null ? null : _data.posType.posTypeName,
           posLevelId: _data.posLevel == null ? null : _data.posLevel.id,
           posTypeId: _data.posType == null ? null : _data.posType.id,