Commit c4f5ea61 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.4' into MVP1.4

parents 04143249 b499373d
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
FROM sys_user FROM sys_user
LEFT JOIN sys_dept ON sys_dept.dept_id = sys_user.dept_id LEFT JOIN sys_dept ON sys_dept.dept_id = sys_user.dept_id
<where> <where>
sys_user.del_flag = '0' sys_user.del_flag = '0' and sys_user.type != '2'
<if test="query.username != null and query.username != ''"> <if test="query.username != null and query.username != ''">
<bind name="usernameLike" value="'%' + query.username + '%'" /> <bind name="usernameLike" value="'%' + query.username + '%'" />
and sys_user.username LIKE #{usernameLike} and sys_user.username LIKE #{usernameLike}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment