From 4044a71aeac9aa372bd81b40000947868006d384 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Thu, 10 Mar 2022 15:25:14 +0800
Subject: [PATCH] =?UTF-8?q?revert:=20=E5=9B=9E=E6=BB=9A=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/rbac/api/permission.py    |  1 -
 apps/rbac/models/permission.py | 28 ++++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/apps/rbac/api/permission.py b/apps/rbac/api/permission.py
index 2589975dd..75025ba8a 100644
--- a/apps/rbac/api/permission.py
+++ b/apps/rbac/api/permission.py
@@ -51,4 +51,3 @@ class PermissionViewSet(JMSModelViewSet):
 #         perms = RoleBinding.get_user_perms(request.user)
 #         serializer = super().get_serializer(data={'perms': perms})
 #         return Res
-
diff --git a/apps/rbac/models/permission.py b/apps/rbac/models/permission.py
index a15eb17a0..2b0122c5d 100644
--- a/apps/rbac/models/permission.py
+++ b/apps/rbac/models/permission.py
@@ -64,12 +64,22 @@ class Permission(DjangoPermission):
             q |= Q(**kwargs)
         return q
 
+    @classmethod
+    def clean_permissions(cls, permissions, scope=Scope.system):
+        if scope == Scope.org:
+            excludes = const.org_exclude_permissions
+        else:
+            excludes = const.system_exclude_permissions
+        q = cls.get_define_permissions_q(excludes)
+        if q:
+            permissions = permissions.exclude(q)
+        return permissions
+
     @staticmethod
     def create_tree_nodes(permissions, scope, check_disabled=False):
-        from ..ztree.tree import ZTree
-        ztree = ZTree(permissions, scope, check_disabled)
-        tree_nodes = ztree.get_tree_nodes()
-        return tree_nodes
+        from ..tree import PermissionTreeUtil
+        util = PermissionTreeUtil(permissions, scope, check_disabled)
+        return util.create_tree_nodes()
 
     @classmethod
     def get_permissions(cls, scope):
@@ -77,13 +87,3 @@ class Permission(DjangoPermission):
         permissions = cls.clean_permissions(permissions, scope=scope)
         return permissions
 
-    @classmethod
-    def clean_permissions(cls, permissions, scope=Scope.system):
-        from ..ztree.tree import ZTree
-        perms_app_label_codename = ZTree.get_permissions_app_label_codename(scope)
-        q = Q()
-        for app_label_codename in perms_app_label_codename:
-            app_label, codename = app_label_codename.split('.')
-            q |= Q(**{'content_type__app_label': app_label, 'codename': codename})
-        permissions = permissions.filter(q)
-        return permissions