From 6587f3280784f91eb88fa90f18528860a526be06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Sat, 9 Aug 2025 15:38:32 +0800 Subject: [PATCH] 1 --- yuthon_hr_attendance/controllers/applet_attendance.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 68c5e480d..ffb4f1e1d 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -630,8 +630,8 @@ class AppletAttendance(Controller): # 表具基础信息 'code': electric.name, 'last_dosage': electric.last_dosage, - 'mater_data': electric.meter_date, - 'last_mater_data': electric.last_meter, + 'mater_data': str(electric.meter_date) if electric.meter_date else ' ', + 'last_mater_data': str(electric.last_meter) if electric.last_meter else ' ', 'meter_type': 'electric', 'employee_name': property_info.lessee_id.name, 'address': property_info.name, @@ -646,8 +646,8 @@ class AppletAttendance(Controller): all_records.append({ 'code': water.name, 'last_dosage': water.last_dosage, - 'mater_data': water.meter_date, - 'last_mater_data': water.last_meter, + 'mater_data': str(water.meter_date) if water.meter_date else ' ', + 'last_mater_data': str(water.last_meter) if water.last_meter else ' ', 'meter_type': 'water', 'employee_name': property_info.lessee_id.name, 'address': property_info.name,