From 4cf3786f48f0f42adc7ecf9352ddfc7df038f5bc Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 01 六月 2020 10:46:30 +0800
Subject: [PATCH] 升级fastjson到最新版1.2.70 修复高危安全漏洞
---
ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml b/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
index 6517828..3466914 100644
--- a/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
@@ -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">
@@ -54,16 +54,17 @@
<if test="operName != null and operName != ''">
AND oper_name like concat('%', #{operName}, '%')
</if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
- and date_format(oper_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
+ <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+ and date_format(oper_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d')
</if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
- and date_format(oper_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
+ <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+ 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="String">
+ <delete id="deleteOperLogByIds" parameterType="Long">
delete from sys_oper_log where oper_id in
<foreach collection="array" item="operId" open="(" separator="," close=")">
#{operId}
--
Gitblit v1.9.2