Merge pull request #6673 from jumpserver/pr@dev@user_role_search

fix: 用户角色搜索

apps/users/serializers/user.py

@@ -2,14 +2,13 @@
 #
 from django.core.cache import cache
 from django.utils.translation import ugettext_lazy as _
-from django.db.models import TextChoices
 from rest_framework import serializers
 
 from common.mixins import CommonBulkSerializerMixin
 from common.permissions import CanUpdateDeleteUser
 from orgs.models import ROLE as ORG_ROLE
 from ..models import User
-
+from ..const import SystemOrOrgRole, PasswordStrategy
 
 __all__ = [
     'UserSerializer', 'UserRetrieveSerializer', 'MiniUserSerializer',
@@ -18,10 +17,6 @@ __all__ = [
 
 
 class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
-    class PasswordStrategy(TextChoices):
-        email = 'email', _('Reset link will be generated and sent to the user')
-        custom = 'custom', _('Set password')
-
     password_strategy = serializers.ChoiceField(
         choices=PasswordStrategy.choices, default=PasswordStrategy.email, required=False,
         write_only=True, label=_('Password strategy')
@@ -38,6 +33,7 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
         label=_('Organization role name'), allow_null=True, required=False,
         child=serializers.ChoiceField(choices=ORG_ROLE.choices), default=["User"]
     )
+    system_or_org_role = serializers.ChoiceField(read_only=True, choices=SystemOrOrgRole.choices, label=_('Role'))
 
     class Meta:
         model = User
@@ -60,7 +56,7 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
         fields_verbose = fields_small + [
             'total_role_display', 'org_role_display',
             'mfa_level_display', 'mfa_force_enabled', 'is_first_login',
-            'date_password_last_updated', 'avatar_url',
+            'date_password_last_updated', 'avatar_url', 'system_or_org_role'
         ]
         # 外键的字段
         fields_fk = ['role', 'role_display']
@@ -196,7 +192,6 @@ class InviteSerializer(serializers.Serializer):
 
 
 class ServiceAccountSerializer(serializers.ModelSerializer):
-
     class Meta:
         model = User
         fields = ['id', 'name', 'access_key']