diff --git a/apps/system/serializers.py b/apps/system/serializers.py index 1d1c59c7..a9913c12 100755 --- a/apps/system/serializers.py +++ b/apps/system/serializers.py @@ -384,13 +384,14 @@ class PostRoleCreateSerializer(CustomModelSerializer): class UserInfoSerializer(CustomModelSerializer): - posts_ = UserPostSerializer(source='post', read_only=True) + class Meta: model = User - fields = ['id', 'username', 'name', 'posts_', 'avatar'] + fields = ['id', 'username', 'name', 'post', 'avatar', 'belong_dept', 'type'] class ApkSerializer(serializers.Serializer): version = serializers.CharField(label='版本号') file = serializers.CharField(label='文件地址') + \ No newline at end of file diff --git a/apps/system/views.py b/apps/system/views.py index 809fd4dd..95c4f5c9 100755 --- a/apps/system/views.py +++ b/apps/system/views.py @@ -511,8 +511,8 @@ class UserViewSet(CustomModelViewSet): 'roles': user.roles.values_list('name', flat=True), 'avatar': user.avatar, 'perms': perms, - 'belong_dept': user.belong_dept.id, - 'post': user.post.id, + 'belong_dept': user.belong_dept.id if user.belong_dept else None, + 'post': user.post.id if user.post else None, 'belong_dept_name': user.belong_dept.name if user.belong_dept else '', 'post_name': user.post.name if user.post else '', 'is_superuser': user.is_superuser,