zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
曹前明 2022-06-01 11:35:04 +08:00
parent 84c3991b1f
commit 415f3e68c6
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/apps/ability/serializers_qtask.py
View File

@ -94,7 +94,6 @@ class QActionServiceSerializer(serializers.ModelSerializer):
class QualiCreateSerializer(serializers.ModelSerializer): class QualiCreateSerializer(serializers.ModelSerializer):
citys = serializers.ListField(child=serializers.IntegerField(), label='城市ID列表') citys = serializers.ListField(child=serializers.IntegerField(), label='城市ID列表')
provice = serializers.CharField(label='省ID')
class Meta: class Meta:
model = Quali model = Quali
fields = ['name', 'type', 'grade', 'scope', 'level', 'province', 'city', 'description', 'citys'] fields = ['name', 'type', 'grade', 'scope', 'level', 'province', 'city', 'description', 'citys']
@ -122,6 +121,11 @@ class QActionQualiCreateSerializer(serializers.ModelSerializer):
validated_data['action'] = 'quali:create' validated_data['action'] = 'quali:create'
if validated_data['value2']['type'] in ['CMA', 'CNAS']: if validated_data['value2']['type'] in ['CMA', 'CNAS']:
validated_data['value2']['name'] = validated_data['value2']['type'] 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) return super().create(validated_data)
class QActionQualiUpdateSerializer(serializers.ModelSerializer): class QActionQualiUpdateSerializer(serializers.ModelSerializer):

6
server/apps/system/views.py
View File

@ -211,6 +211,12 @@ class OrganizationViewSet(PageOrNot,ModelViewSet):
filterset_fields = ['pid','name', 'type','can_supervision'] filterset_fields = ['pid','name', 'type','can_supervision']
ordering_fields = ['sort'] ordering_fields = ['sort']
ordering = ['sort', 'pk'] 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]) @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
def sub(self, request, pk=None): def sub(self, request, pk=None):