diff --git a/wfc-auth/src/main/java/org/wfc/auth/service/SysLoginService.java b/wfc-auth/src/main/java/org/wfc/auth/service/SysLoginService.java
index 92429d5..b3ea837 100644
--- a/wfc-auth/src/main/java/org/wfc/auth/service/SysLoginService.java
+++ b/wfc-auth/src/main/java/org/wfc/auth/service/SysLoginService.java
@@ -56,11 +56,11 @@ public class SysLoginService {
             throw new ServiceException("auth.password.not.in.specified.range");
         }
         // 用户名不在指定范围内 错误
-        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "auth.username.not.in.specified.range");
-            throw new ServiceException("auth.username.not.in.specified.range");
-        }
+//        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
+//                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
+//            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "auth.username.not.in.specified.range");
+//            throw new ServiceException("auth.username.not.in.specified.range");
+//        }
         // IP黑名单校验
         String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST));
         if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) {
diff --git a/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java b/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java
index a3d0d89..89e297d 100644
--- a/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java
+++ b/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java
@@ -56,11 +56,11 @@ public class ULoginService {
             throw new ServiceException("auth.password.not.in.specified.range");
         }
         // 用户名不在指定范围内 错误
-        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "auth.username.not.in.specified.range");
-            throw new ServiceException("auth.username.not.in.specified.range");
-        }
+//        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
+//                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
+//            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "auth.username.not.in.specified.range");
+//            throw new ServiceException("auth.username.not.in.specified.range");
+//        }
         // IP黑名单校验
         String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST));
         if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) {
diff --git a/wfc-modules/wfc-system/src/main/resources/mapper/system/SysUserMapper.xml b/wfc-modules/wfc-system/src/main/resources/mapper/system/SysUserMapper.xml
index 1a5bafb..8fba3ce 100644
--- a/wfc-modules/wfc-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/wfc-modules/wfc-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -125,7 +125,7 @@ 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} or u.email = #{userName}) and u.del_flag = '0'
 	</select>
 
 	<select id="selectUserByEmail" parameterType="String" resultMap="SysUserResult">
diff --git a/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml
index 6b0afeb..688c9b6 100644
--- a/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml
+++ b/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml
@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUserByUserName" parameterType="String" resultMap="UUserResult">
 	    <include refid="selectUserVo"/>
-		where u.user_name = #{userName} and u.del_flag = '0'
+		where (u.user_name = #{userName} or u.email = #{userName}) and u.del_flag = '0'
 	</select>
 
 	<select id="selectUserByEmail" parameterType="String" resultMap="UUserResult">