合并分支 'gwj' 到 'master'

notes-attendance/src/main/java/com/zjty/tynotes/attendance/dao/AttendanceDetailsDao.java

@@ -16,4 +16,6 @@ public interface AttendanceDetailsDao extends MongoRepository<AttendanceDetails,
     AttendanceDetails findByUserIdAndDate(String userId,Date date);
 
     List<AttendanceDetails> findAllByUserIdAndDateBetween(String userId,Date startDate,Date endDate);
+
+    List<AttendanceDetails> findAllByUserIdAndDateBetweenAnd(String userId,Date startDate,Date endDate);
 }

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

@@ -25,7 +25,7 @@ public interface AttendanceDetailsService {
      * @param request
      * @return
      */
-    Object findDepartment(AttenRequest request);
+    List<UserAttenVo> findDepartment(AttenRequest request);
 
     /**
      * 查询可查看的部门列表

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

@@ -191,7 +191,12 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
      */
     @Override
     public UserAttenList findAttenList(AttenRequest request, String type) {
+        if(type!=null){
+            if(type.equals("")){
 
+            }
+        }
+//        attendanceDetailsDao.findAllByUserIdAndDateBetween()
         return null;
     }