diff --git a/src/controllers/PermissionOrgController.ts b/src/controllers/PermissionOrgController.ts
index 5257083a..71adb657 100644
--- a/src/controllers/PermissionOrgController.ts
+++ b/src/controllers/PermissionOrgController.ts
@@ -242,7 +242,10 @@ export class PermissionOrgController extends Controller {
       if (!_permissionOrg) {
         throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลสิทธิ์โครงสร้างนี้");
       }
-      profiles = await _permissionOrg.permissionOrgRoots.map((x) => x.profileTree.id);
+      profiles = await _permissionOrg.permissionOrgRoots.map((x) => x.profileId);
+    } else {
+      const _permissionOrg = await this.permissionOrgRepository.find();
+      profiles = await _permissionOrg.map((x) => x.profileId);
     }
 
     let queryLike =
@@ -275,7 +278,7 @@ export class PermissionOrgController extends Controller {
       .leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
       .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
       .andWhere(`profile.id IN (:...profiles)`, {
-        profiles: profiles == null ? [] : profiles,
+        profiles: profiles == null || profiles.length == 0 ? ["null"] : profiles,
       })
       .andWhere(
         requestBody.searchKeyword != undefined &&