bug修改

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):

server/apps/system/views.py

@@ -212,6 +212,12 @@ class OrganizationViewSet(PageOrNot,ModelViewSet):
     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):
         """