!3650 1

Merge pull request !3650 from 李鹏宇/dev

yuthon_hr_attendance/controllers/applet_attendance.py

@@ -82,8 +82,7 @@ class AppletAttendance(Controller):
                                                                                           '缺卡'] else f'<p style="color:green">{check_in_str}</p>'
         check_out_html = f'<p style="color:red">{check_out_str}</p>' if check_out_status in ['迟到', '早退',
                                                                                              '缺卡'] else f'<p style="color:green">{check_out_str}</p>'
-        if not self.is_within_radius_geopy(kw['att_latitude'], kw['att_longitude'], address_id.latitude,
-                                           address_id.longitude, card_rice):
+        if not self.is_within_radius_geopy(kw['att_latitude'], kw['att_longitude'], address_id.latitude, address_id.longitude, card_rice):
             message = "超出范围，不允许打卡"
             state = "no"
             state_result = "超出范围"
@@ -95,7 +94,7 @@ class AppletAttendance(Controller):
         data = {
             'location': '%s' % address_id.address_name,
             'user_id': user_id.id,
-            'class': [f"{attendance_id.shift_name}{start_time_str}-{end_time_str}"],
+            'class': f"{attendance_id.shift_name}{start_time_str}-{end_time_str}",
             'state_result': state_result,
             'check_in': check_in_html,
             'check_in_status': check_in_status,