From 4cf5573c368bb0f987c08ac4b1a7ecd3d03d2570 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Wed, 12 Aug 2020 17:21:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(users):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=B8=8E=E7=94=A8=E6=88=B7=E7=BB=84=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E6=B2=A1=E8=A7=A6=E5=8F=91=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/users/api/relation.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/users/api/relation.py b/apps/users/api/relation.py
index fbab92ee9..218d52142 100644
--- a/apps/users/api/relation.py
+++ b/apps/users/api/relation.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
 
-from rest_framework_bulk import BulkModelViewSet
 from django.db.models import F
 
+from common.drf.api import JMSBulkRelationModelViewSet
 from common.permissions import IsOrgAdmin
 from .. import serializers
 from ..models import User
@@ -11,17 +11,17 @@ from ..models import User
 __all__ = ['UserUserGroupRelationViewSet']
 
 
-class UserUserGroupRelationViewSet(BulkModelViewSet):
+class UserUserGroupRelationViewSet(JMSBulkRelationModelViewSet):
     filter_fields = ('user', 'usergroup')
     search_fields = filter_fields
     serializer_class = serializers.UserUserGroupRelationSerializer
     permission_classes = (IsOrgAdmin,)
+    m2m_field = User.groups.field
 
     def get_queryset(self):
-        queryset = User.groups.through.objects.all()\
-            .annotate(user_display=F('user__name'))\
-            .annotate(usergroup_display=F('usergroup__name'))
-        return queryset
+        return super().get_queryset().annotate(
+            user_display=F('user__name'), usergroup_display=F('usergroup__name')
+        )
 
     def allow_bulk_destroy(self, qs, filtered):
         if filtered.count() != 1: