From 415f3e68c64a7a941aafa27bf0bc77c2c9d432bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Wed, 1 Jun 2022 11:35:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=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 | 6 +++++-
 server/apps/system/views.py              | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/server/apps/ability/serializers_qtask.py b/server/apps/ability/serializers_qtask.py
index 6208d20..c16835d 100644
--- a/server/apps/ability/serializers_qtask.py
+++ b/server/apps/ability/serializers_qtask.py
@@ -94,7 +94,6 @@ class QActionServiceSerializer(serializers.ModelSerializer):
 
 class QualiCreateSerializer(serializers.ModelSerializer):
     citys = serializers.ListField(child=serializers.IntegerField(), label='城市ID列表')
-    provice = serializers.CharField(label='省ID')
     class Meta:
         model = Quali
         fields = ['name', 'type', 'grade', 'scope', 'level', 'province', 'city', 'description', 'citys']
@@ -122,6 +121,11 @@ class QActionQualiCreateSerializer(serializers.ModelSerializer):
         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['province']:
+            value2['province'] = value2['province'].id
+        if value2['city']:
+            value2['city'] = value2['city'].id
         return super().create(validated_data)
 
 class QActionQualiUpdateSerializer(serializers.ModelSerializer):
diff --git a/server/apps/system/views.py b/server/apps/system/views.py
index d3a05d8..025713b 100644
--- a/server/apps/system/views.py
+++ b/server/apps/system/views.py
@@ -211,6 +211,12 @@ class OrganizationViewSet(PageOrNot,ModelViewSet):
     filterset_fields = ['pid','name', 'type','can_supervision']
     ordering_fields = ['sort']
     ordering = ['sort', 'pk']
+
+    def filter_queryset(self, queryset):
+        queryset = super().filter_queryset(queryset)
+        if self.request.query_params.get('service_ok', 1):
+            queryset = queryset.filter(service__isnull=True)
+        return queryset
     
     @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
     def sub(self, request, pk=None):