perf: 统一用户名称的label显示

apps/rbac/api/rolebinding.py

@@ -27,14 +27,7 @@ class RoleBindingViewSet(OrgBulkModelViewSet):
 
     def get_queryset(self):
         queryset = self._get_queryset() \
-            .prefetch_related('user', 'role', 'org') \
+            .prefetch_related('user', 'role', 'org')
-            .annotate(
-            user_display=Concat(
-                F('user__name'), Value('('),
-                F('user__username'), Value(')')
-            ),
-            role_display=F('role__name')
-        )
         return queryset
 
     def _get_queryset(self):

apps/rbac/serializers/rolebinding.py

@@ -1,6 +1,8 @@
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
+from common.serializers.fields import ObjectRelatedField
+from users.models import User
 from orgs.serializers import CurrentOrgDefault
 from ..models import RoleBinding, SystemRoleBinding, OrgRoleBinding
 
@@ -10,16 +12,18 @@ __all__ = [
 
 
 class RoleBindingSerializer(serializers.ModelSerializer):
+    user = ObjectRelatedField(
+        required=False, queryset=User.objects,
+        label=_('User'), attrs=('id', 'name', 'username')
+    )
+
     class Meta:
         model = RoleBinding
         fields = [
-            'id', 'user', 'user_display', 'role', 'role_display',
+            'id', 'user', 'role', 'scope', 'org', 'org_name',
-            'scope', 'org', 'org_name',
         ]
         read_only_fields = ['scope']
         extra_kwargs = {
-            'user_display': {'label': _('User display')},
-            'role_display': {'label': _('Role display')},
             'org_name': {'label': _("Org name")}
         }