|  | @@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 | 
	
		
			
				|  |  |  	
 | 
	
		
			
				|  |  |  	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 | 
	
		
			
				|  |  |  	    <include refid="selectUserVo"/>
 | 
	
		
			
				|  |  | -		where u.user_name = #{userName}
 | 
	
		
			
				|  |  | +		where u.user_name = #{userName} and u.del_flag = '0'
 | 
	
		
			
				|  |  |  	</select>
 | 
	
		
			
				|  |  |  	
 | 
	
		
			
				|  |  |  	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 | 
	
	
		
			
				|  | @@ -131,15 +131,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 | 
	
		
			
				|  |  |  	</select>
 | 
	
		
			
				|  |  |  	
 | 
	
		
			
				|  |  |  	<select id="checkUserNameUnique" parameterType="String" resultType="int">
 | 
	
		
			
				|  |  | -		select count(1) from sys_user where user_name = #{userName} limit 1
 | 
	
		
			
				|  |  | +		select count(1) from sys_user where user_name = #{userName} and del_flag = '0' limit 1
 | 
	
		
			
				|  |  |  	</select>
 | 
	
		
			
				|  |  |  	
 | 
	
		
			
				|  |  |  	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 | 
	
		
			
				|  |  | -		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
 | 
	
		
			
				|  |  | +		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 | 
	
		
			
				|  |  |  	</select>
 | 
	
		
			
				|  |  |  	
 | 
	
		
			
				|  |  |  	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 | 
	
		
			
				|  |  | -		select user_id, email from sys_user where email = #{email} limit 1
 | 
	
		
			
				|  |  | +		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 | 
	
		
			
				|  |  |  	</select>
 | 
	
		
			
				|  |  |  	
 | 
	
		
			
				|  |  |  	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
 | 
	
	
		
			
				|  | @@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 | 
	
		
			
				|  |  |  	</update>
 | 
	
		
			
				|  |  |  	
 | 
	
		
			
				|  |  |  	<delete id="deleteUserById" parameterType="Long">
 | 
	
		
			
				|  |  | -		update sys_user set del_flag = '2' where user_id = #{userId}
 | 
	
		
			
				|  |  | + 		update sys_user set del_flag = '2' where user_id = #{userId}
 | 
	
		
			
				|  |  |   	</delete>
 | 
	
		
			
				|  |  |   	
 | 
	
		
			
				|  |  |   	<delete id="deleteUserByIds" parameterType="Long">
 |