From 4b4eb27dcc051acba3841e7205dc4a593924362d Mon Sep 17 00:00:00 2001 From: zm <2369059705qq.com> Date: 星期三, 23 十月 2024 17:16:31 +0800 Subject: [PATCH] 打卡记录列表 --- src/main/java/com/product/administration/service/PunchRecordService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/product/administration/service/PunchRecordService.java b/src/main/java/com/product/administration/service/PunchRecordService.java index 33adaad..48fe93b 100644 --- a/src/main/java/com/product/administration/service/PunchRecordService.java +++ b/src/main/java/com/product/administration/service/PunchRecordService.java @@ -194,7 +194,7 @@ lateSb.append("涓婄彮鏈墦鍗�"); } - if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_four"))){ + if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_four"))&&ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_range_four"))){ String punch_time_four = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_four")); punch_time_four_date = DateUtil.parse(punch_time_four); if(punch_time_four_date.before(afternoon_work_off_date)){ -- Gitblit v1.9.2