Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/AttendanceDetailsServiceImpl.java

@@ -65,8 +65,12 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
             AttendanceDetails allByUserIdAndAttenDate1 = attendanceDetailsDao.findByUserIdAndAttenDate(request.getId(), startTime);
             AttendanceDetails allByUserIdAndAttenDate2 = attendanceDetailsDao.findByUserIdAndAttenDate(request.getId(), endTime);
             List<AttendanceDetails> attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndAttenDateBetween(request.getId(), startTime, endTime);
-            attendanceDetailsList.add(allByUserIdAndAttenDate1);
-            attendanceDetailsList.add(allByUserIdAndAttenDate2);
+            if(allByUserIdAndAttenDate1!=null){
+                attendanceDetailsList.add(allByUserIdAndAttenDate1);
+            }
+            if(allByUserIdAndAttenDate2!=null){
+                attendanceDetailsList.add(allByUserIdAndAttenDate2);
+            }
             userAttenVo = new UserAttenVo();
             userAttenVo.setUserId(request.getId());
             Optional<User> optional = pasUserDao.findById(request.getId());