api/admin_views.py

@@ -194,22 +194,22 @@ def query_userinfo(request):

                 
              

                     userinfos = UserInfo.objects.filter(Q(status=True) & Q(user_id__icontains=user_id) & (Q(nickname__icontains=query) | Q(phone__icontains=query))).order_by('-created_at')
              

                 
              

                -    if level != '':
              

                +    if level:
              

                         userinfos = userinfos.filter(level=level)
              

                     
              

                -    if code_version != '':
              

                +    if code_version:
              

                         userinfos = userinfos.filter(code_version=code_version)
              

                     
              

                -    if subscribe != '':
              

                +    if subscribe:
              

                         userinfos = userinfos.filter(subscribe=subscribe)
              

                     
              

                -    if has_membercard != '':
              

                +    if has_membercard:
              

                         userinfos = userinfos.filter(has_membercard=has_membercard)
              

                     
              

                -    if is_member != '':
              

                +    if is_member:
              

                         userinfos = userinfos.filter(level__gte=1)
              

                     
              

                -    if start_time != '' and end_time != '':
              

                +    if start_time and end_time:
              

                         ftime = datetime.strptime(start_time + ' 00:00:00', '%Y%m%d %H:%M:%S')
              

                         ttime = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')
              

                         userinfos = userinfos.filter(created_at__range=[ftime, ttime])
              
@@ -615,10 +615,10 @@ def record_consumer(request):

                     
              

                     logs = ConsumeInfoSubmitLogInfo.objects.filter(Q(status=True) & Q(test_user=False) & (Q(model_name__icontains=query) | Q(phone__icontains=query) | Q(serialNo__icontains=query))).order_by('-created_at')
              

                 
              

                -    if dupload != '':
              

                +    if dupload:
              

                         logs = logs.filter(dupload=dupload)
              

                     
              

                -    if code_version != '':
              

                +    if code_version:
              

                         logs = logs.filter(code_version=code_version)
              

                     
              

                     if start_time and end_time:
              
@@ -657,20 +657,20 @@ def record_sale(request):

                     
              

                     logs = SaleclerkSubmitLogInfo.objects.filter(Q(status=True) & Q(test_user=False) & Q(test_sn=False) & (Q(model_name__icontains=query) | Q(clerk_name__icontains=query) | Q(distributor_name__icontains=query)| Q(code__icontains=query))).order_by('-created_at')
              

                 
              

                -    if dupload != '':
              

                +    if dupload:
              

                         logs = logs.filter(dupload=dupload)
              

                     
              

                     if code_version:
              

                         logs = logs.filter(code_version=code_version)
              

                     
              

                -    if has_scan != '':
              

                +    if has_scan:
              

                         logs = logs.filter(has_scan=has_scan)
              

                 
              

                     if start_time and end_time:
              

                         logs = logs.filter(ymd__gte=start_time, ymd__lte=end_time)
              

                 
              

                -    if is_online_sale != '':
              

                -        logs = logs.filter(remark=('扫描条形码' if is_online_sale else ''))
              

                +    if is_online_sale:
              

                +        logs = logs.filter(remark=('扫描条形码' if is_online_sale == '1' else ''))
              

                     
              

                 
              

                     count = logs.count()