Merge branch 'linshiquit' into uat

suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -592,7 +592,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	<delete id="deleteByLoginName" parameterType="int">
 		delete from sys_user_author_rel where user_id = (
-		    select user_id from sys_user where 1=1
+		    select user_id from sys_user where 1=1 and del_flag='0' and  quit is null
 		    <if test="loginName !=null and loginName !='' ">
 				and login_name=#{loginName}
 			</if>