From d47f6d80fcd0ccb279a27fd80c3bd45775fc2eed Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期五, 07 二月 2025 11:19:49 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 f96321b..2c92d06 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
@@ -1,9 +1,13 @@
package com.ruoyi.system.service.impl;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.TFaultAreaDic;
+import com.ruoyi.system.query.SysOperLogQuery;
import com.ruoyi.system.service.ISysOperLogService;
+import com.ruoyi.system.vo.SysOperLogVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -78,10 +82,13 @@
operLogMapper.cleanOperLog();
}
-// @Override
-// public List<SysOperLogVO> selectOperLogPageList(SysOperLogQuery query) {
-// return operLogMapper.selectOperLogPageList(query);
-// }
+ @Override
+ public PageInfo<SysOperLogVO> selectOperLogPageList(SysOperLogQuery query) {
+ PageInfo<SysOperLogVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<SysOperLogVO> list = operLogMapper.selectOperLogPageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
// @Override
// public void getLogDetail(List<SysOperLogVO> sysOperLogVOS) {
--
Gitblit v1.7.1