From 42008124b68bfd7f2e2003c07bc0bdd5311f95b6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 29 四月 2020 09:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml b/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
index 0d2e7a6..53cb94f 100644
--- a/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
@@ -25,7 +25,7 @@
<sql id="selectOperLogVo">
select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time
- from sys_oper_log order by oper_id desc
+ from sys_oper_log
</sql>
<insert id="insertOperlog" parameterType="SysOperLog">
@@ -39,7 +39,7 @@
<if test="title != null and title != ''">
AND title like concat('%', #{title}, '%')
</if>
- <if test="businessType != null">
+ <if test="businessType != null and businessType != ''">
AND business_type = #{businessType}
</if>
<if test="businessTypes != null and businessTypes.length > 0">
@@ -61,6 +61,7 @@
and date_format(oper_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
</if>
</where>
+ order by oper_id desc
</select>
<delete id="deleteOperLogByIds" parameterType="Long">
--
Gitblit v1.9.3