From 5c83ac4c86dfc788c0aaf9ea8a2d1bc570c6152f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sun, 11 Apr 2021 15:45:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E9=A2=86=E5=AD=A6=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test_server/crm/views.py | 4 ++-- test_server/examtest/models_paper.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test_server/crm/views.py b/test_server/crm/views.py index 038c77b..5faef9c 100644 --- a/test_server/crm/views.py +++ b/test_server/crm/views.py @@ -242,6 +242,8 @@ class ConsumerViewSet(ModelViewSet): queryset = self.get_serializer_class().setup_eager_loading(queryset) if self.request.user.is_superuser: return queryset + if self.request.query_params.get('adminoff', None): + return queryset.filter(create_admin=None) roles = self.request.user.roles.values_list('name', flat=True) if '普通管理' in roles: queryset = queryset.filter(create_admin = self.request.user) @@ -257,8 +259,6 @@ class ConsumerViewSet(ModelViewSet): return Consumer.objects.none() else: return queryset.none() - if self.request.query_params.get('adminoff', None): - return queryset.filter(create_admin=None) return queryset def create(self, request, *args, **kwargs): diff --git a/test_server/examtest/models_paper.py b/test_server/examtest/models_paper.py index 448337d..81b927a 100644 --- a/test_server/examtest/models_paper.py +++ b/test_server/examtest/models_paper.py @@ -33,6 +33,7 @@ class WorkScope(CommonModel): questioncat = models.ManyToManyField(Questioncat, verbose_name='所选科目') rule = models.ForeignKey(TestRule, on_delete=models.CASCADE, verbose_name='试卷结构') can_exam = models.BooleanField('是否可组织考试', default=False) + # can_choose = models.BooleanField('客户是否可选择', default=False) class Meta: verbose_name = '工作类别'