From 32ddaeacae5a2ee2ec3b89594c77d31fc39ae363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 6 Jun 2022 15:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/apps/ability/serializers_qtask.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/server/apps/ability/serializers_qtask.py b/server/apps/ability/serializers_qtask.py
index c9dd333..9561466 100644
--- a/server/apps/ability/serializers_qtask.py
+++ b/server/apps/ability/serializers_qtask.py
@@ -123,15 +123,16 @@ class QActionQualiCreateSerializer(serializers.ModelSerializer):
 
     def create(self, validated_data):
         validated_data['action'] = 'quali:create'
-        if validated_data['value2']['type'] in ['CMA', 'CNAS']:
-            validated_data['value2']['name'] = validated_data['value2']['type']
-        value2 = validated_data['value2']
-        if value2.get('province', None):
-            value2['province'] = value2['province'].id
-        if value2.get('city', None):
-            value2['city'] = value2['city'].id
-        if value2.get('file', None):
-            value2['file'] = value2['file'].id
+        value2 = self.data['value2']
+        if value2['type'] in ['CMA', 'CNAS']:
+            value2['name'] = value2['type']
+        validated_data['value2'] = value2
+        # if value2.get('province', None):
+        #     value2['province'] = value2['province'].id
+        # if value2.get('city', None):
+        #     value2['city'] = value2['city'].id
+        # if value2.get('file', None):
+        #     value2['file'] = value2['file'].id
         return super().create(validated_data)
 
 class QActionQualiUpdateSerializer(serializers.ModelSerializer):
@@ -142,9 +143,7 @@ class QActionQualiUpdateSerializer(serializers.ModelSerializer):
     
     def create(self, validated_data):
         validated_data['action'] = 'quali:update'
-        value2 = validated_data['value2']
-        if value2.get('file', None):
-            value2['file'] = value2['file'].id
+        validated_data['value2'] = self.data['value2']
         return super().create(validated_data)
 
 class QActionACreateSerializer(serializers.ModelSerializer):