From 50344dfca2b153bba06a8fb8a98b74ce3358ceaa Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 19 Apr 2022 13:27:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0userstandardserializer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/qm/serializers.py | 6 +++--- hb_server/apps/system/serializers.py | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hb_server/apps/qm/serializers.py b/hb_server/apps/qm/serializers.py index 494f30c..0dd0def 100644 --- a/hb_server/apps/qm/serializers.py +++ b/hb_server/apps/qm/serializers.py @@ -1,7 +1,7 @@ from rest_framework import serializers from apps.mtm.models import RecordForm, RecordFormField from apps.mtm.serializers import RecordFormFieldSerializer, RecordFormSimpleSerializer -from apps.system.serializers import FileSimpleSerializer, UserSimpleSerializer +from apps.system.serializers import FileSimpleSerializer, UserSimpleSerializer, UserStandardSerializer from apps.wpm.serializers import WProductBaseSerializer from .models import Standard, TestItem, TestRecord, TestRecordItem from django.db import transaction @@ -98,8 +98,8 @@ class TestRecordDetailSerializer(serializers.ModelSerializer): # record_data = TestRecordItemSerializer(source='item_test_record', read_only=True, many=True) record_data = serializers.SerializerMethodField() origin_test_ = TestRecordDetailBaseSerializer(source='origin_test', read_only=True) - create_by_ = UserSimpleSerializer(source='create_by', read_only=True) - update_by_ = UserSimpleSerializer(source='update_by', read_only=True) + create_by_ = UserStandardSerializer(source='create_by', read_only=True) + update_by_ = UserStandardSerializer(source='update_by', read_only=True) wproduct_ = WProductBaseSerializer(source='wproduct', read_only=True) class Meta: model = TestRecord diff --git a/hb_server/apps/system/serializers.py b/hb_server/apps/system/serializers.py index c5a684b..1ee7375 100644 --- a/hb_server/apps/system/serializers.py +++ b/hb_server/apps/system/serializers.py @@ -122,16 +122,20 @@ class OrganizationSimpleSerializer(serializers.ModelSerializer): fields = ['id', 'name'] class UserSimpleSerializer(serializers.ModelSerializer): - signature= serializers.SerializerMethodField() class Meta: model = User fields = ['id', 'username', 'name'] + +class UserStandardSerializer(serializers.ModelSerializer): + signature= serializers.SerializerMethodField() + class Meta: + model = User + fields = ['id', 'username', 'name', 'signature'] def get_signature(self, obj): if obj.employee_user: return obj.employee_user.signature return None - # class UserStandardSerializer(serializers.ModelSerializer): # dept_name = serializers.StringRelatedField(source='dept') # class Meta: