时间筛选

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/attendance/impl/LeaveApprovalDaoImpl.java

@@ -41,13 +41,13 @@ public class LeaveApprovalDaoImpl implements LeaveApprovalDaoExtend {
 //            criteria.and("leaveStatus").in(leaveStatus);
 //        }
 
-        if (startTime != null){
-            criteria.and("createTime").gte(startTime);
+        if (startTime != null && endTime != null){
+            criteria.and("createTime").gte(startTime).lte(endTime);
         }
 
-        if (endTime != null){
-            criteria.and("createTime").lte(endTime);
-        }
+//        if (endTime != null){
+//            criteria.and("createTime").lte(endTime);
+//        }
 
         if (LeaveQueryType.Wait.equals(queryType)){
             criteria.and("leaveStatus").is(LeaveStatus.Wait);