diff --git a/apps/hrm/services.py b/apps/hrm/services.py index db099536..22538d46 100755 --- a/apps/hrm/services.py +++ b/apps/hrm/services.py @@ -219,7 +219,7 @@ class HrmService: # 如果是进门 ep = Employee.objects.filter(id_number=id_number, type__in=["employee", "remployee"]).first() # 如果是内部/相关方员工创建上班打卡记录(更新) - if ep and ep.is_atwork is False: + if ep: now = timezone.now() cr_10 = ClockRecord.objects.filter( type=10, employee=ep, create_time__year=now.year, create_time__month=now.month, create_time__day=now.day).first() @@ -243,9 +243,9 @@ class HrmService: # 如果是出门 id_number = data['info']['extend']['paperNumber'] if id_number: - ep = Employee.objects.filter(id_number=id_number, type="employee").first() + ep = Employee.objects.filter(id_number=id_number, type__in=["employee", "remployee"]).first() # 如果是内部/相关方员工创建下班打卡记录(更新) - if ep and ep.is_atwork: + if ep: now = timezone.now() cr_20 = ClockRecord.objects.filter( type=20, employee=ep, create_time__year=now.year, create_time__month=now.month, create_time__day=now.day).first()