|
@@ -92,7 +92,7 @@ public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo
|
|
|
clockInfo.setId(IdGenerator.generateUUID());
|
|
|
//下班打卡
|
|
|
if ("3".equals(clockInfo.getClockType())) {
|
|
|
- if (timeOfFive.compareTo(currentTime) > 0 && clockInfo1.getLeaveId() == null) {
|
|
|
+ if (timeOfFive.compareTo(currentTime) > 0) {
|
|
|
//早退
|
|
|
clockInfo.setLeaveEarlyFlag("1");
|
|
|
}
|
|
@@ -100,7 +100,7 @@ public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo
|
|
|
}
|
|
|
//上班打卡
|
|
|
else {
|
|
|
- if (currentTime.compareTo(timeOfEight) > 0 && clockInfo1.getLeaveId() == null) {
|
|
|
+ if (currentTime.compareTo(timeOfEight) > 0) {
|
|
|
//迟到
|
|
|
clockInfo.setLateFlag("1");
|
|
|
}
|