diff --git a/bonus-framework/src/main/java/com/bonus/framework/web/service/LoginUserService.java b/bonus-framework/src/main/java/com/bonus/framework/web/service/LoginUserService.java
index 9f4e9ce..cb4b462 100644
--- a/bonus-framework/src/main/java/com/bonus/framework/web/service/LoginUserService.java
+++ b/bonus-framework/src/main/java/com/bonus/framework/web/service/LoginUserService.java
@@ -33,7 +33,7 @@ public class LoginUserService {
 
     public LoginUser loadUserByUsername(String username) throws UsernameNotFoundException
     {
-        SysUser user = userService.selectUserByUserName(username);
+        SysUser user = userService.selectUserByPhone(username);
         if (StringUtils.isNull(user))
         {
             log.info("登录用户：{} 不存在.", username);
@@ -50,7 +50,7 @@ public class LoginUserService {
             throw new ServiceException(MessageUtils.message("登录用户已被删除"));
         }
 
-        passwordService.validate(user);
+        //passwordService.validate(user);
         return createLoginUser(user);
     }
 
diff --git a/bonus-framework/src/main/java/com/bonus/framework/web/service/SysLoginService.java b/bonus-framework/src/main/java/com/bonus/framework/web/service/SysLoginService.java
index 3562278..8afcc26 100644
--- a/bonus-framework/src/main/java/com/bonus/framework/web/service/SysLoginService.java
+++ b/bonus-framework/src/main/java/com/bonus/framework/web/service/SysLoginService.java
@@ -130,7 +130,7 @@ public class SysLoginService
           if(StringUtils.isEmpty(data)){
               throw new ServiceException("验证码已过期!");
           }else {
-              if(data.equals(code)){
+              if(!data.equals(code)){
                   throw new ServiceException("验证码不正确!");
               }
           }
diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java
index 7e24d22..a8d08ee 100644
--- a/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java
+++ b/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java
@@ -43,6 +43,8 @@ public interface SysUserMapper
      */
     public SysUser selectUserByUserName(String userName);
 
+    public SysUser selectUserByPhone(String userName);
+
     /**
      * 通过用户ID查询用户
      * 
diff --git a/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java b/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java
index 8034172..2b570d5 100644
--- a/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java
+++ b/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java
@@ -205,4 +205,11 @@ public interface ISysUserService
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
     String getUserInfo(String phone);
+
+    /**
+     * 依据手机号查询用户
+     * @param username
+     * @return
+     */
+    SysUser selectUserByPhone(String username);
 }
diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
index 53f4505..13ba066 100644
--- a/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
+++ b/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
@@ -115,7 +115,10 @@ public class SysUserServiceImpl implements ISysUserService
     {
         return userMapper.selectUserByUserName(userName);
     }
-
+    @Override
+    public SysUser selectUserByPhone(String username) {
+        return userMapper.selectUserByPhone(username);
+    }
     /**
      * 通过用户ID查询用户
      * 
@@ -559,4 +562,6 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return null;
     }
+
+
 }
diff --git a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index 13211e2..887eafa 100644
--- a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -122,9 +122,14 @@ 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'
+	</select>
+
+
+	<select id="selectUserByPhone" parameterType="String" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
 		where u.phonenumber = #{userName} and u.del_flag = '0'
 	</select>
-	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}