Merge pull request #10004 from jumpserver/pr@v3.1@perf_import_export

perf: 优化导入导出

apps/accounts/serializers/account/account.py

@@ -81,7 +81,7 @@ class AccountAssetSerializer(serializers.ModelSerializer):
 
     def to_internal_value(self, data):
         if isinstance(data, dict):
-            i = data.get('id')
+            i = data.get('id') or data.get('pk')
         else:
             i = data
 

apps/common/drf/parsers/base.py

@@ -111,7 +111,7 @@ class BaseFileParser(BaseParser):
         return {'pk': obj_id, 'name': obj_name}
 
     def parse_value(self, field, value):
-        if value is '-':
+        if value == '-' and field and field.allow_null:
             return None
         elif hasattr(field, 'to_file_internal_value'):
             value = field.to_file_internal_value(value)