[Bugfix] 修复授权列表用户无法搜索的bug

ibuler · ibuler · commit 785b375f4a3e · 2019-08-08T18:32:44.000+08:00
diff --git a/apps/perms/api/asset_permission.py b/apps/perms/api/asset_permission.py
@@ -115,6 +115,7 @@ def filter_asset(self, queryset):
     def filter_user(self, queryset):
         user_id = self.request.query_params.get('user_id')
         username = self.request.query_params.get('username')
+        query_group = self.request.query_params.get('all')
         if user_id:
             user = get_object_or_none(User, pk=user_id)
         elif username:
@@ -123,6 +124,15 @@ def filter_user(self, queryset):
             return queryset
         if not user:
             return queryset.none()
+        else:
+            kwargs = {}
+            args = []
+            if query_group:
+                groups = user.groups.all()
+                args.append(Q(users=user) | Q(user_groups__in=groups))
+            else:
+                kwargs["users"] = user
+            return queryset.filter(*args, **kwargs).distinct()
 
     def filter_user_group(self, queryset):
         user_group_id = self.request.query_params.get('user_group_id')
@@ -148,6 +158,7 @@ def filter_keyword(self, queryset):
     def filter_queryset(self, queryset):
         queryset = super().filter_queryset(queryset)
         queryset = self.filter_valid(queryset)
+        queryset = self.filter_user(queryset)
         queryset = self.filter_keyword(queryset)
         queryset = self.filter_asset(queryset)
         queryset = self.filter_node(queryset)
