From a62d65a9b8b7471c720bdb360e6f2121a8ce5dd4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 09 十二月 2021 11:48:55 +0800
Subject: [PATCH] fix 修复 TreeBuildUtils 顶节点不为 0 问题
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 72 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
index c39ced0..a03274d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
@@ -3,6 +3,8 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.dto.OperLogDTO;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -44,27 +46,27 @@
}
@Override
- public TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog) {
+ public TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog, PageQuery pageQuery) {
Map<String, Object> params = operLog.getParams();
LambdaQueryWrapper<SysOperLog> lqw = new LambdaQueryWrapper<SysOperLog>()
- .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
- .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
- SysOperLog::getBusinessType, operLog.getBusinessType())
- .func(f -> {
- if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) {
- f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
- }
- })
- .eq(operLog.getStatus() != null,
- SysOperLog::getStatus, operLog.getStatus())
- .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName())
- .apply(StringUtils.isNotEmpty(params.get("beginTime")),
- "date_format(oper_time,'%y%m%d') >= date_format({0},'%y%m%d')",
- params.get("beginTime"))
- .apply(StringUtils.isNotEmpty(params.get("endTime")),
- "date_format(oper_time,'%y%m%d') <= date_format({0},'%y%m%d')",
- params.get("endTime"));
- return PageUtils.buildDataInfo(page(PageUtils.buildPage("oper_id", "desc"), lqw));
+ .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
+ .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
+ SysOperLog::getBusinessType, operLog.getBusinessType())
+ .func(f -> {
+ if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) {
+ f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
+ }
+ })
+ .eq(operLog.getStatus() != null,
+ SysOperLog::getStatus, operLog.getStatus())
+ .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName())
+ .between(params.get("beginTime") != null && params.get("endTime") != null,
+ SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime"));
+ if(StringUtils.isBlank(pageQuery.getOrderByColumn())) {
+ pageQuery.setOrderByColumn("oper_id").setIsAsc("desc");
+ }
+ Page<SysOperLog> page = page(PageUtils.buildPage(pageQuery), lqw);
+ return PageUtils.buildDataInfo(page);
}
/**
@@ -88,24 +90,20 @@
public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
Map<String, Object> params = operLog.getParams();
return list(new LambdaQueryWrapper<SysOperLog>()
- .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
- .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
- SysOperLog::getBusinessType, operLog.getBusinessType())
- .func(f -> {
- if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) {
- f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
- }
- })
- .eq(operLog.getStatus() != null && operLog.getStatus() > 0,
- SysOperLog::getStatus, operLog.getStatus())
- .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName())
- .apply(StringUtils.isNotEmpty(params.get("beginTime")),
- "date_format(oper_time,'%y%m%d') >= date_format({0},'%y%m%d')",
- params.get("beginTime"))
- .apply(StringUtils.isNotEmpty(params.get("endTime")),
- "date_format(oper_time,'%y%m%d') <= date_format({0},'%y%m%d')",
- params.get("endTime"))
- .orderByDesc(SysOperLog::getOperId));
+ .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
+ .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
+ SysOperLog::getBusinessType, operLog.getBusinessType())
+ .func(f -> {
+ if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) {
+ f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
+ }
+ })
+ .eq(operLog.getStatus() != null && operLog.getStatus() > 0,
+ SysOperLog::getStatus, operLog.getStatus())
+ .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName())
+ .between(params.get("beginTime") != null && params.get("endTime") != null,
+ SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime"))
+ .orderByDesc(SysOperLog::getOperId));
}
/**
--
Gitblit v1.9.3