feat: 🎸 处理授权管理列表用户

api/v1/views/user.py

@@ -59,12 +59,18 @@ def user_list(request, tenant_id: str, query_data: UserListQueryIn=Query(...)):
 # @paginate(CustomPagination)
 def user_list_no_super(request, tenant_id: str):
     from arkid.core.perm.permission_data import PermissionData
-    super_user_id = User.valid_objects.order_by('created').first().id
+    pd = PermissionData()
+    # super_user_id = User.valid_objects.order_by('created').first().id
     tenant = request.tenant
-    users = tenant.users.filter(is_del=False).exclude(id=super_user_id)
+    user_managers = pd.get_tenant_managers(tenant)
+    exclude_ids = []
+    for user_manager in user_managers:
+        exclude_ids.append(user_manager.id)
+    users = tenant.users.filter(is_del=False)
+    if exclude_ids:
+        users = users.exclude(id__in=exclude_ids)
     # 如果当前登录的用户不是管理员，需要根据用户所拥有的分组进行区分
     login_user = request.user
-    pd = PermissionData()
     users = pd.get_manage_all_user(login_user, tenant, users)
     return {"data": list(users.all())}
 

arkid/core/perm/permission_data.py

@@ -2545,6 +2545,27 @@ def has_admin_perm(self, tenant, user):
                         return True
         return False
 
+    def get_tenant_managers(self, tenant):
+        '''
+        取得当前租户所有的管理员
+        '''
+        systempermission = SystemPermission.valid_objects.filter(tenant=tenant, code=tenant.admin_perm_code, is_system=True).first()
+        userpermissionresults = UserPermissionResult.valid_objects.filter(
+            app=None,
+            tenant=tenant,
+        )
+        compress = Compress()
+        users = []
+        for userpermissionresult in userpermissionresults:
+            permission_result = compress.decrypt(userpermissionresult.result)
+            permission_result_arr = list(permission_result)
+            if len(permission_result_arr) > systempermission.sort_id:
+                check_result = int(permission_result_arr[systempermission.sort_id])
+                if check_result == 1 and userpermissionresult.user not in users:
+                    users.append(userpermissionresult.user)
+        return users
+
+
     def create_tenant_admin_permission(self, tenant):
         '''
         创建租户管理员权限