diff --git a/apps/vm/services.py b/apps/vm/services.py index db2be451..a96f47f7 100644 --- a/apps/vm/services.py +++ b/apps/vm/services.py @@ -45,14 +45,12 @@ def visit_audit_end(ticket): for i in Vpeople.objects.filter(visit=visit): visitor = i.visitor # if visitor.id_number and visitor.photo: - if visitor.id_number: - ep = Employee.objects.get_queryset(all=True).filter(id_number=visitor.id_number).first() - elif visitor.phone: - ep = Employee.objects.get_queryset(all=True).filter(phone=visitor.phone).first() - else: - ep = Employee.objects.get_queryset(all=True).filter(name=visitor.name, id_number=None).first() + ep = Employee.objects.get_queryset(all=True).filter(id_number=visitor.id_number).first() + ep2 = Employee.objects.get_queryset(all=True).filter(phone=visitor.phone).first() if ep: pass + elif ep2: + ep = ep2 else: ep = Employee() ep.id_number = visitor.id_number @@ -82,14 +80,13 @@ def visit_driver_end(ticket): # 更新企业司机人员库 for i in Vpeople.objects.filter(visit=visit): visitor = i.visitor - if visitor.id_number: - ep = Employee.objects.get_queryset(all=True).filter(id_number=visitor.id_number).first() - elif visitor.phone: - ep = Employee.objects.get_queryset(all=True).filter(phone=visitor.phone).first() - else: - ep = Employee.objects.get_queryset(all=True).filter(name=visitor.name, id_number=None).first() + # 尝试找到人员 + ep = Employee.objects.get_queryset(all=True).filter(id_number=visitor.id_number).first() + ep2 = Employee.objects.get_queryset(all=True).filter(phone=visitor.phone).first() if ep: pass + elif ep2: + ep = ep2 else: ep = Employee() ep.id_number = visitor.id_number