From 2c211875e56ac3fcf91d2db2532159d8ea9283a2 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Thu, 18 Jul 2024 19:19:57 +0700
Subject: [PATCH 1/2] no message

---
 src/controllers/ProfileController.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 8781a4f6..fb1a01c6 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -3293,6 +3293,7 @@ export class ProfileController extends Controller {
       citizenId: profile.citizenId,
       position: profile.position,
       leaveDate: profile.dateLeave,
+      posMasterId: posMaster == null ? null : posMaster.id,
       posMasterNo: posMaster == null ? null : posMaster.posMasterNo,
       posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName,
       posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank,
@@ -3300,6 +3301,7 @@ export class ProfileController extends Controller {
       posTypeName: profile.posType == null ? null : profile.posType.posTypeName,
       posTypeRank: profile.posType == null ? null : profile.posType.posTypeRank,
       posTypeId: profile.posType == null ? null : profile.posType.id,
+      orgRevisionId: root == null ? null : root.orgRevisionId,
       rootId: root == null ? null : root.id,
       root: root == null ? null : root.orgRootName,
       rootShortName: root == null ? null : root.orgRootShortName,

From bb61091c7c2af17ebdddb526bb1bcfc1ff5e4fdd Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Thu, 18 Jul 2024 20:39:23 +0700
Subject: [PATCH 2/2] no message

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

diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index bcb0fddf..280e358e 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -2700,10 +2700,10 @@ export class PositionController extends Controller {
       .andWhere(
         new Brackets((qb) => {
           qb.andWhere(typeCondition).andWhere(conditionA == null ? "1=1" : conditionA, {
-            posType: posType == null ? `%%` : `%${posType.id}%`,
-            posLevel: posLevel == null ? `%%` : `%${posLevel.id}%`,
-            posTypeRank: posType == null ? "" : posType.posTypeRank,
-            posLevelRank: posLevel == null ? "" : posLevel.posLevelRank,
+            posType: posType == null ? `%%` : `${posType.id}`,
+            posLevel: posLevel == null ? `%%` : `${posLevel.id}`,
+            posTypeRank: posType == null ? 0 : posType.posTypeRank,
+            posLevelRank: posLevel == null ? 0 : posLevel.posLevelRank,
           });
         }),
       )