From 78965434a253bae8a6e1ee84187730e389600f4b Mon Sep 17 00:00:00 2001
From: jingjie520 <jingjie520@gmail.com>
Date: Wed, 18 Sep 2019 14:32:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E8=A1=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E5=90=8E=E7=9A=84=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E8=A1=A8=E5=8D=95=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E3=80=81=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 62b0395b4fd087c28cf30b0a2bac7e193b192171)
---
 .../resources/mapper/system/SysUserMapper.xml    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index b6b14a482..1ab72c4a6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -119,38 +119,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUserByLoginName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
-		where u.login_name = #{userName}
+		where u.del_flag = '0' and u.login_name = #{userName}
 	</select>
 	
 	<select id="selectUserByPhoneNumber" parameterType="String" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.phonenumber = #{phonenumber}
+		where u.del_flag = '0' and u.phonenumber = #{phonenumber}
 	</select>
 	
 	<select id="selectUserByEmail" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
-		where u.email = #{email}
+		where u.del_flag = '0' and u.email = #{email}
 	</select>
 	
 	<select id="checkLoginNameUnique" parameterType="String" resultType="int">
-		select count(1) from sys_user where login_name=#{loginName}
+		select count(1) from sys_user where del_flag = '0' and login_name=#{loginName}
 	</select>
 	
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, phonenumber from sys_user where phonenumber=#{phonenumber}
+		select user_id, phonenumber from sys_user where del_flag = '0' and phonenumber=#{phonenumber}
 	</select>
 	
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, email from sys_user where email=#{email}
+		select user_id, email from sys_user where del_flag = '0' and email=#{email}
 	</select>
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.user_id = #{userId}
+		where u.del_flag = '0' and  u.user_id = #{userId}
 	</select>
 	
 	<delete id="deleteUserById" parameterType="Long">
- 		delete from sys_user where user_id = #{userId}
+		update sys_user set del_flag = '2' and  user_id = #{userId}
  	</delete>
  	
  	<delete id="deleteUserByIds" parameterType="Long">