fix: 考试过期修改
This commit is contained in:
parent
e106fd863d
commit
55a658cad2
|
@ -29,17 +29,17 @@ def get_consumerperm_list(consumer):
|
|||
if consumer.workscope.can_exam: # 如果是三类考试工作类别不做过期检测
|
||||
pass
|
||||
elif consumer.exceed_date and (consumer.exceed_date < datetime.date(timezone.now())):
|
||||
if consumer.name and consumer.ID_number1:
|
||||
candidates = getZs(consumer.name, consumer.ID_number1)
|
||||
if candidates:
|
||||
perms.append('account_exceed')
|
||||
else:
|
||||
# 未通过考试增加30天期限
|
||||
newdate = datetime.date(timezone.now() + timedelta(days=30))
|
||||
consumer.exceed_date = newdate
|
||||
consumer.save()
|
||||
else:
|
||||
perms.append('account_exceed')
|
||||
# if consumer.name and consumer.ID_number1:
|
||||
# candidates = getZs(consumer.name, consumer.ID_number1)
|
||||
# if candidates:
|
||||
# perms.append('account_exceed')
|
||||
# else:
|
||||
# # 未通过考试增加30天期限
|
||||
# newdate = datetime.date(timezone.now() + timedelta(days=30))
|
||||
# consumer.exceed_date = newdate
|
||||
# consumer.save()
|
||||
# else:
|
||||
perms.append('account_exceed')
|
||||
cache.set('cperms_'+str(consumer.id), perms, 60*60)
|
||||
return perms
|
||||
|
||||
|
@ -67,7 +67,7 @@ class MyPermission(RbacPermission):
|
|||
if request.user.exceed_date and (request.user.exceed_date >= datetime.date(timezone.now())):
|
||||
pass
|
||||
else:
|
||||
perms = ['questioncat_view','my_examtest','down_material']
|
||||
perms = ['questioncat_view','my_examtest','down_material', 'account_exceed']
|
||||
if not hasattr(view, 'perms_map'):
|
||||
return True
|
||||
else:
|
||||
|
|
Loading…
Reference in New Issue