From dd5faaf6190511b5a3547f82ac67218d0b737621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Thu, 15 Sep 2022 15:56:30 +0800 Subject: [PATCH] userpost bug --- apps/rpm/serializers.py | 5 ++--- apps/system/views.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/rpm/serializers.py b/apps/rpm/serializers.py index c33ac25d..c5387b0d 100644 --- a/apps/rpm/serializers.py +++ b/apps/rpm/serializers.py @@ -6,7 +6,7 @@ from apps.system.services import sync_dahua_dept from apps.utils.constants import EXCLUDE_FIELDS from apps.utils.fields import MyFilePathField from apps.utils.serializers import CustomModelSerializer -from apps.system.serializers import DictSerializer, DictSimpleSerializer, FileSerializer +from apps.system.serializers import DictSerializer, DictSimpleSerializer, FileSerializer, UserSimpleSerializer from rest_framework import serializers from rest_framework.exceptions import ParseError from django.db import transaction @@ -50,8 +50,7 @@ class RpartyCreateUpdateSerializer(CustomModelSerializer): class RpartySerializer(CustomModelSerializer): - admin_username = serializers.CharField(source='admin.username', read_only=True) - admin_name = serializers.CharField(source='admin.name', read_only=True) + admin_ = UserSimpleSerializer(source='admin', read_only=True) belong_dept_name = serializers.CharField(source='belong_dept.name', read_only=True) class Meta: diff --git a/apps/system/views.py b/apps/system/views.py index 2bf32350..15dbe550 100755 --- a/apps/system/views.py +++ b/apps/system/views.py @@ -407,7 +407,7 @@ class UserPostViewSet(CreateModelMixin, DestroyModelMixin, ListModelMixin, Custo user.update_by = self.request.user user.save() # 更新人员表 - ep = Employee.objects.get_queryset(all=True).filter(user=instance).first() + ep = Employee.objects.get_queryset(all=True).filter(user=user).first() if ep: ep.belong_dept = user.belong_dept ep.post = user.post