21

src/main/java/com/fdkankan/manage/service/impl/OperLogServiceImpl.java

@@ -35,19 +35,9 @@ public class OperLogServiceImpl extends MongodbBaseServiceImpl<OperLog> implemen
         if(StrUtil.isNotEmpty(param.getUserName())){
             query.addCriteria(Criteria.where("userName").regex(param.getUserName()));
         }
-        Criteria createTimeCri = null;
         if(Objects.nonNull(param.getStartTime()) || Objects.nonNull(param.getEndTime())){
-            createTimeCri = Criteria.where("createTime");
-        }
-        if(Objects.nonNull(param.getStartTime())){
-            createTimeCri.gte(param.getStartTime());
-        }
-
-        if(Objects.nonNull(param.getEndTime())){
-            createTimeCri.lte(param.getEndTime());
-        }
-        if(createTimeCri != null){
-            query.addCriteria(createTimeCri);
+            query.addCriteria ( Criteria.where("createTime").gte(param.getStartTime()));
+            query.addCriteria ( Criteria.where("createTime").lte(param.getEndTime()));
         }
         //默认按操作时间降序排序
         param.setOrderBy("createTime");