From 56dfe0d4bf81262622a1919cceb2b039fd356209 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 16:52:49 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
index 96c93bc..6d7f30a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
@@ -16,6 +16,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.dto.SupplierDTO;
@@ -57,6 +58,8 @@
public class SysOperlogController extends BaseController
{
@Resource
+ private TokenService tokenService;
+ @Resource
private SysOperLogMapper operLogService;
@Autowired
@@ -67,6 +70,7 @@
@PostMapping("/list")
public R<Page<SysOperLog>> list(@RequestBody SysOperLogQuery gy)
{
+ tokenService.getLoginUser();
Page<SysOperLog> page = new Page<>();
page.setSize(gy.getPageSize());
page.setCurrent(gy.getPageCurr());
@@ -86,14 +90,13 @@
}
if(gy.getBeginTime()!=null){
- wrapper.le(SysOperLog::getOperTime, gy.getBeginTime());
+ wrapper.gt(SysOperLog::getOperTime, gy.getBeginTime());
}
if(gy.getEndTime()!=null){
- wrapper.gt(SysOperLog::getOperTime, gy.getEndTime());
+ wrapper.lt(SysOperLog::getOperTime, gy.getEndTime());
}
-
-
+ wrapper.orderByDesc(SysOperLog::getOperTime);
Page<SysOperLog> sysOperLogPage = operLogService.selectPage(page, wrapper);
return R.ok(sysOperLogPage);
}
--
Gitblit v1.7.1