From b544380018377d19543b7493acba994df9fa6d9a Mon Sep 17 00:00:00 2001
From: kittapath <kittapath@frappet.com>
Date: Fri, 6 Sep 2024 16:05:29 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=A3=E0=B8=B5=E0=B9=88=20list=20=E0=B8=84?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/controllers/PermissionOrgController.ts b/src/controllers/PermissionOrgController.ts
index 0e8a7246..4c74a527 100644
--- a/src/controllers/PermissionOrgController.ts
+++ b/src/controllers/PermissionOrgController.ts
@@ -279,8 +279,8 @@ export class PermissionOrgController extends Controller {
       .leftJoinAndSelect("current_holders.orgChild2", "orgChild2")
       .leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
       .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
-      .andWhere(`profileTree.id IN (:...profiles)`, {
-        profiles: profiles == null || profiles.length == 0 ? ["null"] : profiles,
+      .andWhere(requestBody.id == null ? "1=1" : `permissionOrg.orgRootId LIKE :rootId`, {
+        rootId: requestBody.id,
       })
       .andWhere(
         requestBody.searchKeyword != undefined &&
@@ -388,8 +388,8 @@ export class PermissionOrgController extends Controller {
 
         return {
           id: _data.id,
-          profileId: _data.profileTree.id,
-          orgRootId: _data.orgRootTree.id,
+          profileId: _data.profileId,
+          orgRootId: _data.orgRootId,
           orgNew: _data.orgRootTree.orgRootName,
           avatar: _data.profileTree.avatar,
           avatarName: _data.profileTree.avatarName,