mirror of
https://github.com/1024-lab/smart-admin.git
synced 2026-01-15 07:05:30 +08:00
v3.21.0 【新增】修改部门名称字段;【新增】修改系统版本version字段;【新增】优化代码生成前端代码;【优化】SQL
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
</if>
|
||||
<!--关键字-->
|
||||
<if test="queryForm.keyword != null and queryForm.keyword != ''">
|
||||
AND ( INSTR(t_change_log.version,#{queryForm.keyword})
|
||||
AND ( INSTR(t_change_log.update_version,#{queryForm.keyword})
|
||||
OR INSTR(t_change_log.publish_author,#{queryForm.keyword})
|
||||
OR INSTR(t_change_log.content,#{queryForm.keyword})
|
||||
)
|
||||
@@ -35,12 +35,12 @@
|
||||
AND t_change_log.link = #{queryForm.link}
|
||||
</if>
|
||||
</where>
|
||||
order by t_change_log.version desc
|
||||
order by t_change_log.update_version desc
|
||||
</select>
|
||||
|
||||
<select id="selectByVersion"
|
||||
resultType="net.lab1024.sa.base.module.support.changelog.domain.entity.ChangeLogEntity">
|
||||
select * from t_change_log where `version` = #{version}
|
||||
select * from t_change_log where update_version = #{version}
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<if test="query.userType != null">
|
||||
AND user_type = #{query.userType}
|
||||
</if>
|
||||
<if test="query.ip != null">
|
||||
<if test="query.ip != null and query.ip != ''">
|
||||
AND INSTR(login_ip,#{query.ip})
|
||||
</if>
|
||||
<if test="query.startDate != null and query.startDate != ''">
|
||||
@@ -25,9 +25,6 @@
|
||||
<if test="query.userName != null and query.userName != ''">
|
||||
AND INSTR(user_name,#{query.userName})
|
||||
</if>
|
||||
<if test="query.ip != null">
|
||||
AND INSTR(login_ip,#{query.ip})
|
||||
</if>
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
@@ -37,9 +34,9 @@
|
||||
*
|
||||
from t_login_log
|
||||
where
|
||||
user_id = #{userId}
|
||||
and user_type = #{userType}
|
||||
and login_result = #{loginLogResult}
|
||||
user_id = #{userId}
|
||||
and user_type = #{userType}
|
||||
and login_result = #{loginLogResult}
|
||||
order by login_log_id desc
|
||||
limit 1
|
||||
</select>
|
||||
|
||||
@@ -23,10 +23,10 @@
|
||||
AND INSTR(operate_user_name,#{query.userName})
|
||||
</if>
|
||||
<if test="query.keywords != null and query.keywords != ''">
|
||||
AND (INSTR(`module`,#{query.keywords}) OR INSTR(content,#{query.keywords}))
|
||||
AND (INSTR(module,#{query.keywords}) OR INSTR(content,#{query.keywords}))
|
||||
</if>
|
||||
<if test="query.requestKeywords != null and query.requestKeywords != ''">
|
||||
AND (INSTR(`url`,#{query.requestKeywords}) OR INSTR(`method`,#{query.requestKeywords}) OR INSTR(`param`,#{query.requestKeywords}))
|
||||
AND (INSTR(url,#{query.requestKeywords}) OR INSTR(method,#{query.requestKeywords}) OR INSTR(param,#{query.requestKeywords}))
|
||||
</if>
|
||||
<if test="query.successFlag != null">
|
||||
AND success_flag = #{query.successFlag}
|
||||
|
||||
Reference in New Issue
Block a user