|
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.fdkankan.manage.entity.OperLog;
|
|
|
import com.fdkankan.manage.service.OperLogService;
|
|
|
+import com.fdkankan.manage.util.Dateutils;
|
|
|
import com.fdkankan.manage.vo.OperLogPageParamVO;
|
|
|
import com.fdkankan.mongodb.base.MongoPageResult;
|
|
|
import com.fdkankan.mongodb.service.impl.MongodbBaseServiceImpl;
|
|
@@ -36,7 +37,7 @@ public class OperLogServiceImpl extends MongodbBaseServiceImpl<OperLog> implemen
|
|
|
query.addCriteria(Criteria.where("userName").regex(param.getUserName()));
|
|
|
}
|
|
|
if(Objects.nonNull(param.getStartTime()) || Objects.nonNull(param.getEndTime())){
|
|
|
- query.addCriteria ( Criteria.where("createTime").gte(param.getStartTime()).lte(param.getEndTime()));
|
|
|
+ query.addCriteria (Criteria.where("createTime").gte(Dateutils.getDate(param.getStartTime())).lte(Dateutils.getDate(param.getEndTime())));
|
|
|
}
|
|
|
//默认按操作时间降序排序
|
|
|
param.setOrderBy("createTime");
|