From a031b19864aae54eabed0d47d25190242e7ffdeb Mon Sep 17 00:00:00 2001
From: kittapath <kittapath@frappet.com>
Date: Thu, 22 Aug 2024 14:35:53 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=9F=E0=B9=89=E0=B9=80=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=84=E0=B8=AA=E0=B8=B4=E0=B8=94=E0=B8=88=E0=B8=B2=E0=B8=81?=
 =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/PermissionController.ts | 46 ++++++++++++++++---------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/controllers/PermissionController.ts b/src/controllers/PermissionController.ts
index 62341dde..bc95151e 100644
--- a/src/controllers/PermissionController.ts
+++ b/src/controllers/PermissionController.ts
@@ -265,15 +265,22 @@ export class PermissionController extends Controller {
         },
       });
       if (!posMaster) {
-        throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลตำแหน่งในโครงสร้าง");
+        reply = {
+          orgRootId: null,
+          orgChild1Id: null,
+          orgChild2Id: null,
+          orgChild3Id: null,
+          orgChild4Id: null,
+        };
+      } else {
+        reply = {
+          orgRootId: posMaster.orgRootId,
+          orgChild1Id: posMaster.orgChild1Id,
+          orgChild2Id: posMaster.orgChild2Id,
+          orgChild3Id: posMaster.orgChild3Id,
+          orgChild4Id: posMaster.orgChild4Id,
+        };
       }
-      reply = {
-        orgRootId: posMaster.orgRootId,
-        orgChild1Id: posMaster.orgChild1Id,
-        orgChild2Id: posMaster.orgChild2Id,
-        orgChild3Id: posMaster.orgChild3Id,
-        orgChild4Id: posMaster.orgChild4Id,
-      };
       redisClient.setex("posMaster_" + profile.id, 86400, JSON.stringify(reply));
     }
 
@@ -310,15 +317,22 @@ export class PermissionController extends Controller {
         },
       });
       if (!posMaster) {
-        throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลตำแหน่งในโครงสร้าง");
+        reply = {
+          orgRootId: null,
+          orgChild1Id: null,
+          orgChild2Id: null,
+          orgChild3Id: null,
+          orgChild4Id: null,
+        };
+      } else {
+        reply = {
+          orgRootId: posMaster.orgRootId,
+          orgChild1Id: posMaster.orgChild1Id,
+          orgChild2Id: posMaster.orgChild2Id,
+          orgChild3Id: posMaster.orgChild3Id,
+          orgChild4Id: posMaster.orgChild4Id,
+        };
       }
-      reply = {
-        orgRootId: posMaster.orgRootId,
-        orgChild1Id: posMaster.orgChild1Id,
-        orgChild2Id: posMaster.orgChild2Id,
-        orgChild3Id: posMaster.orgChild3Id,
-        orgChild4Id: posMaster.orgChild4Id,
-      };
       redisClient.setex("user_" + profile.id, 86400, JSON.stringify(reply));
     }