From 19eb583a27a2a49914d4a70227d1df72c2701f43 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 09:24:07 +0800
Subject: [PATCH] 修改合作商权限功能

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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 9332647..2c72a37 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
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.annotation.Logical;
 import com.ruoyi.system.query.SysOperLogQuery;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,7 @@
 	private ISysOperLogService operLogService;
 	
 	
+	@RequiresPermissions(value = {"/operationLog/list"}, logical = Logical.OR)
 	@GetMapping("/list")
 	@ApiOperation(value = "获取操作日志列表", tags = {"管理后台-操作日志"})
 	public AjaxResult<PageInfo<SysOperLog>> list(SysOperLogQuery query) {
@@ -55,7 +57,7 @@
 		if(null != query.getStartTime() && null != query.getEndTime()){
 			wrapper.between(SysOperLog::getOperTime, query.getStartTime(), query.getEndTime());
 		}
-		PageInfo<SysOperLog> page = operLogService.page(pageInfo, wrapper);
+		PageInfo<SysOperLog> page = operLogService.page(pageInfo, wrapper.orderByDesc(SysOperLog::getOperTime));
 		return AjaxResult.success(page);
 	}
 	

--
Gitblit v1.7.1