|
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
|
|
|
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, 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'
|
|
|
+ where u.del_flag = '0' and u.status = '0'
|
|
|
<if test="userName != null and userName != ''">
|
|
|
AND u.user_name like concat('%', #{userName}, '%')
|
|
|
</if>
|
|
@@ -85,12 +85,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
|
|
|
<include refid="selectUserVo"/>
|
|
|
- where u.user_name = #{userName} and u.del_flag = '0'
|
|
|
+ where u.user_name = #{userName} and u.del_flag = '0' and u.status = '0'
|
|
|
</select>
|
|
|
|
|
|
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
|
|
|
<include refid="selectUserVo"/>
|
|
|
- where u.user_id = #{userId} and u.del_flag = '0'
|
|
|
+ where u.user_id = #{userId} and u.del_flag = '0' and u.status = '0'
|
|
|
</select>
|
|
|
|
|
|
<select id="checkUserNameUnique" parameterType="String" resultType="int">
|
|
@@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</select>
|
|
|
|
|
|
<select id="selectUserByDeptId" parameterType="Long" resultMap="SysUserResult">
|
|
|
- select user_name, phonenumber from sys_user where dept_id = #{deptId} and del_flag = '0'
|
|
|
+ select user_name, phonenumber from sys_user where dept_id = #{deptId} and del_flag = '0' and status = '0'
|
|
|
</select>
|
|
|
|
|
|
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
|