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

认领学员

This commit is contained in:
caoqianming 2021-04-11 15:45:17 +08:00
parent 231ff0c064
commit 5c83ac4c86
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test_server/crm/views.py
View File

@ -242,6 +242,8 @@ class ConsumerViewSet(ModelViewSet):
queryset = self.get_serializer_class().setup_eager_loading(queryset) queryset = self.get_serializer_class().setup_eager_loading(queryset)
if self.request.user.is_superuser: if self.request.user.is_superuser:
return queryset 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) roles = self.request.user.roles.values_list('name', flat=True)
if '普通管理' in roles: if '普通管理' in roles:
queryset = queryset.filter(create_admin = self.request.user) queryset = queryset.filter(create_admin = self.request.user)
@ -257,8 +259,6 @@ class ConsumerViewSet(ModelViewSet):
return Consumer.objects.none() return Consumer.objects.none()
else: else:
return queryset.none() return queryset.none()
if self.request.query_params.get('adminoff', None):
return queryset.filter(create_admin=None)
return queryset return queryset
def create(self, request, *args, **kwargs): def create(self, request, *args, **kwargs):

1
test_server/examtest/models_paper.py
View File

@ -33,6 +33,7 @@ class WorkScope(CommonModel):
questioncat = models.ManyToManyField(Questioncat, verbose_name='所选科目') questioncat = models.ManyToManyField(Questioncat, verbose_name='所选科目')
rule = models.ForeignKey(TestRule, on_delete=models.CASCADE, verbose_name='试卷结构') rule = models.ForeignKey(TestRule, on_delete=models.CASCADE, verbose_name='试卷结构')
can_exam = models.BooleanField('是否可组织考试', default=False) can_exam = models.BooleanField('是否可组织考试', default=False)
# can_choose = models.BooleanField('客户是否可选择', default=False)
class Meta: class Meta:
verbose_name = '工作类别' verbose_name = '工作类别'