|
@@ -5,7 +5,7 @@
|
|
<sql id="includeLog">
|
|
<sql id="includeLog">
|
|
id,
|
|
id,
|
|
username,
|
|
username,
|
|
- COALESCE(operation, '') operation,
|
|
|
|
|
|
+ COALESCE(action, '') action,
|
|
COALESCE(classname, '') classname,
|
|
COALESCE(classname, '') classname,
|
|
COALESCE(method, '') method,
|
|
COALESCE(method, '') method,
|
|
COALESCE(params, '') params,
|
|
COALESCE(params, '') params,
|
|
@@ -17,7 +17,7 @@
|
|
<resultMap id="resultMapLogList" type="java.util.LinkedHashMap">
|
|
<resultMap id="resultMapLogList" type="java.util.LinkedHashMap">
|
|
<id property="id" column="id" jdbcType="BIGINT" />
|
|
<id property="id" column="id" jdbcType="BIGINT" />
|
|
<result property="username" column="username" />
|
|
<result property="username" column="username" />
|
|
- <result property="operation" column="operation" />
|
|
|
|
|
|
+ <result property="action" column="action" />
|
|
<result property="classname" column="classname" />
|
|
<result property="classname" column="classname" />
|
|
<result property="method" column="method" />
|
|
<result property="method" column="method" />
|
|
<result property="params" column="params" />
|
|
<result property="params" column="params" />
|
|
@@ -33,8 +33,8 @@
|
|
<if test="username != null and username != ''">
|
|
<if test="username != null and username != ''">
|
|
AND username LIKE CONCAT('%', #{username}, '%')
|
|
AND username LIKE CONCAT('%', #{username}, '%')
|
|
</if>
|
|
</if>
|
|
- <if test="operation != null and operation != ''">
|
|
|
|
- AND operation LIKE CONCAT('%', #{operation}, '%')
|
|
|
|
|
|
+ <if test="action != null and action != ''">
|
|
|
|
+ AND action LIKE CONCAT('%', #{action}, '%')
|
|
</if>
|
|
</if>
|
|
<if test="ip != null and ip != ''">
|
|
<if test="ip != null and ip != ''">
|
|
AND ip = #{ip}
|
|
AND ip = #{ip}
|