chenshudong 4 mēneši atpakaļ
vecāks
revīzija
ea61cfb97f

+ 4 - 0
airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendanceRecordServiceImpl.java

@@ -347,6 +347,10 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
347 347
             List<AttendanceRecord> tempList = attendanceRecords.stream().filter(record -> record.getAttendanceDate().equals(dto.getCheckInDate())).collect(Collectors.toList());
348 348
             if (CollectionUtil.isEmpty(tempList)) {
349 349
                 Date attendanceDate = attendanceRecords.get(0).getAttendanceDate();
350
+                Date attendanceDateEnd = attendanceRecords.get(0).getAttendanceDateEnd();
351
+                if (attendanceDateEnd != null) {
352
+                    return result;
353
+                }
350 354
                 attendanceRecords = attendanceRecords.stream().filter(record -> record.getAttendanceDate().equals(attendanceDate)).collect(Collectors.toList());
351 355
             } else {
352 356
                 attendanceRecords = tempList;