From 81de7a534973976c5750ca2591ee59d9172116d0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 27 Jan 2022 10:57:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E8=AF=A6=E6=83=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/system/serializers.py | 8 ++++---- hb_server/apps/system/views.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hb_server/apps/system/serializers.py b/hb_server/apps/system/serializers.py index 209061c..d59d538 100644 --- a/hb_server/apps/system/serializers.py +++ b/hb_server/apps/system/serializers.py @@ -137,14 +137,14 @@ class UserListSerializer(DynamicFieldsSerializerMixin, serializers.ModelSerializ """ 用户列表序列化 """ - dept_name = serializers.StringRelatedField(source='dept') - roles_name = serializers.StringRelatedField(source='roles', many=True) + dept_ = OrganizationSimpleSerializer(source='dept', read_only=True) + roles_ = RoleSerializer(source='roles', many=True) class Meta: model = User fields = ['id', 'name', 'phone', 'email', 'position', 'username', 'is_active', 'date_joined', - 'dept_name', 'dept', 'roles', 'avatar', - 'roles_name', 'is_atwork', 'last_check_time'] + 'dept_', 'dept', 'roles', 'avatar', + 'roles_', 'is_atwork', 'last_check_time'] @staticmethod def setup_eager_loading(queryset): diff --git a/hb_server/apps/system/views.py b/hb_server/apps/system/views.py index 9ef7c28..3664054 100644 --- a/hb_server/apps/system/views.py +++ b/hb_server/apps/system/views.py @@ -261,7 +261,7 @@ class UserViewSet(ModelViewSet): # 根据请求类型动态变更serializer if self.action == 'create': return UserCreateSerializer - elif self.action == 'list': + elif self.action in ['list', 'retrieve']: return UserListSerializer return UserModifySerializer