Merge branch 'system-zyj' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserByUserNameOne" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.user_name = #{userName} and u.tenant_id = #{tenantId}
+		where u.del_flag=0 and u.status=0 and u.user_name = #{userName} and u.tenant_id = #{tenantId}
 	</select>
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">