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

@@ -205,8 +205,8 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
             Date endTime = calendar.getTime();
             if(type!=null){
                 if(type.equals("事假")){
-                    List<AttendanceDetails> attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndDateBetweenAndIsThingLeaveDay(
-                            request.getId(), startTime, endTime, "0");
+//                    List<AttendanceDetails> attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndDateBetweenAndIsThingLeaveDay(
+//                            request.getId(), startTime, endTime, "0");
                 }
             }
         } catch (ParseException e) {