From 40440ca250c4de8d78efc81472bb8a0ee80a144e Mon Sep 17 00:00:00 2001
From: kittapath <kittapath@frappet.com>
Date: Fri, 13 Sep 2024 17:38:11 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84=20?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B4=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C=E0=B9=82?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/OrganizationController.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index be2f06b3..54e68676 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -617,15 +617,16 @@ export class OrganizationController extends Controller {
     if (!orgRevision) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
     }
-
-    if (
-      !request.user.role.includes("SUPER_ADMIN") &&
-      orgRevision.orgRevisionIsCurrent == true &&
-      orgRevision.orgRevisionIsDraft == false
-    ) {
-      await new permission().PermissionList(request, "SYS_ORG");
+    let attrOwnership = null;
+    if (!request.user.role.includes("SUPER_ADMIN")) {
+      let _privilege = await new permission().PermissionOrgList(request, "SYS_ORG");
+      attrOwnership = _privilege.root == null ? true : false;
     }
-    if (orgRevision.orgRevisionIsDraft == true && orgRevision.orgRevisionIsCurrent == false) {
+    if (
+      orgRevision.orgRevisionIsDraft == true &&
+      orgRevision.orgRevisionIsCurrent == false &&
+      attrOwnership == false
+    ) {
       const profile = await this.profileRepo.findOne({
         where: { keycloak: request.user.sub },
         relations: ["permissionProfiles"],