|
@@ -285,9 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
|
|
|
|
|
|
|
<select id="selectUserListNoZj" parameterType="SysUser" resultMap="SysUserResult">
|
|
<select id="selectUserListNoZj" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
|
|
|
|
|
- left join sys_dept d on u.dept_id = d.dept_id
|
|
|
|
|
- where u.del_flag = '0'
|
|
|
|
|
|
|
+ <include refid="selectUserVo"/>
|
|
|
<if test="userId != null and userId != 0">
|
|
<if test="userId != null and userId != 0">
|
|
|
AND u.user_id not in (#{userId})
|
|
AND u.user_id not in (#{userId})
|
|
|
</if>
|
|
</if>
|
|
@@ -315,8 +313,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="parameter != null and parameter != ''">
|
|
<if test="parameter != null and parameter != ''">
|
|
|
AND (u.phonenumber like concat('%', #{parameter}, '%') or u.nick_name like concat('%', #{parameter}, '%'))
|
|
AND (u.phonenumber like concat('%', #{parameter}, '%') or u.nick_name like concat('%', #{parameter}, '%'))
|
|
|
</if>
|
|
</if>
|
|
|
- <!-- 数据范围过滤 -->
|
|
|
|
|
- ${params.dataScope}
|
|
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
</mapper>
|
|
</mapper>
|
