From 27960bf47230cebf9a5760b8dc76c685f3e3ca74 Mon Sep 17 00:00:00 2001
From: lizhenhua <1075222162@qq.com>
Date: Wed, 24 Jul 2024 19:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A4=87=E4=BB=BD=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/system/controller/SysLogController.java |  3 +++
 .../src/main/resources/mapper/system/SysLogMapper.xml | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysLogController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysLogController.java
index 4a926a2..ca5ca79 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysLogController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysLogController.java
@@ -74,6 +74,7 @@ public class SysLogController extends BaseController {
     @SysLog(title = "审计日志", module = "审计日志->系统日志", grade = OperaType.QUERY, details = "查询系统日志列表", type = "系统日志")
     public TableDataInfo getSystemLogs(SysLogsVo dto) {
         try{
+            dto.setOperType("查询");
             dto.setLogType(0);
             startPage();
             List<SysLogsVo> list = service.getSystemLogs(dto);
@@ -90,6 +91,7 @@ public class SysLogController extends BaseController {
     public TableDataInfo getYwLogs(SysLogsVo dto) {
         try{
             dto.setLogType(1);
+            dto.setOperType("查询");
             startPage();
             List<SysLogsVo> list = service.getSystemLogs(dto);
             return getDataTable(list);
@@ -105,6 +107,7 @@ public class SysLogController extends BaseController {
     public TableDataInfo getErrLogs(SysLogsVo dto) {
         try{
             dto.setLogType(2);
+            dto.setOperType("查询");
             startPage();
             List<SysLogsVo> list = service.getSystemLogs(dto);
             return getDataTable(list);
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogMapper.xml
index 1f8c7f8..c235186 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogMapper.xml
@@ -95,10 +95,10 @@
             <if test="model!=null and model!=''">
                 and model LIKE concat('%',#{model},'%')
             </if>
-            <if test="operType!=null and operType!=''">
+            <if test="operType!=null and operType !=''">
                  and oper_type LIKE concat('%',#{operType},'%')
             </if>
-            <if test="params!=null and params!=''">
+            <if test="params!=null and params !=''">
                 and params LIKE concat('%',#{params},'%')
             </if>
 
@@ -111,8 +111,11 @@
             <if test="endTime!=null and endTime!=''">
                 and  oper_time  BETWEEN concat(#{startTime}, ' 00:00:00') AND concat(#{endTime},' 23:59:59')
             </if>
-            <if test="ip!=null and ip!=''">
-                and ip=#{ip}
+            <if test="ip !=null and ip!=''">
+                and ip LIKE concat('%',#{ip},'%')
+            </if>
+            <if test="result !=null and result !=''">
+                and result LIKE concat('%',#{result},'%')
             </if>
         <if test="logSort!=null  and  logDesc !=null and  logSort!='' and logDesc!='' ">
             order by