From f1f07a3213a41c6e41bc56d268b7f8e3a67c057d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 10 十月 2022 18:25:27 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/sys/OperateService.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lf/server/service/sys/OperateService.java b/src/main/java/com/lf/server/service/sys/OperateService.java
index 3a286fe..2d8b40f 100644
--- a/src/main/java/com/lf/server/service/sys/OperateService.java
+++ b/src/main/java/com/lf/server/service/sys/OperateService.java
@@ -1,10 +1,12 @@
 package com.lf.server.service.sys;
 
 import com.lf.server.entity.sys.OperateEntity;
+import com.lf.server.helper.StringHelper;
 import com.lf.server.mapper.sys.OperateMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -18,13 +20,17 @@
     OperateMapper operateMapper;
 
     @Override
-    public Integer selectCount(String userid) {
-        return operateMapper.selectCount(userid);
+    public Integer selectCount(String uname, Integer type, Timestamp start, Timestamp end) {
+        uname = StringHelper.isNull(uname) ? null : "%" + uname.trim() + "%";
+
+        return operateMapper.selectCount(uname, type, start, end);
     }
 
     @Override
-    public List<OperateEntity> selectByPage(String userid, Integer limit, Integer offset) {
-        return operateMapper.selectByPage(userid,limit,offset);
+    public List<OperateEntity> selectByPage(String uname, Integer type, Timestamp start, Timestamp end, Integer limit, Integer offset) {
+        uname = StringHelper.isNull(uname) ? null : "%" + uname.trim() + "%";
+
+        return operateMapper.selectByPage(uname, type, start, end, limit, offset);
     }
 
     @Override

--
Gitblit v1.9.3