认领学员

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

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 = '工作类别'