fix: 修复授权树一些问题

apps/perms/models/base.py

@@ -8,6 +8,7 @@ from django.db.models import Q
 from django.utils import timezone
 from orgs.mixins.models import OrgModelMixin
 
+from common.db.models import UnionQuerySet
 from common.utils import date_expired_default, lazyproperty
 from orgs.mixins.models import OrgManager
 
@@ -100,10 +101,15 @@ class BasePermission(OrgModelMixin):
         from users.models import User
         users_id = self.users.all().values_list('id', flat=True)
         groups_id = self.user_groups.all().values_list('id', flat=True)
-        users = User.objects.filter(
-            Q(id__in=users_id) | Q(groups__id__in=groups_id)
-        ).distinct()
-        return users
+
+        users_id = list(users_id)
+        groups_id = list(groups_id)
+
+        qs1 = User.objects.filter(id__in=users_id).distinct()
+        qs2 = User.objects.filter(groups__id__in=groups_id).distinct()
+
+        qs = UnionQuerySet(qs1, qs2)
+        return qs
 
     @lazyproperty
     def users_amount(self):