1

snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/enums/AuthExceptionEnum.java

@@ -52,6 +52,7 @@ public enum AuthExceptionEnum {
      * 密码错误
      */
     PWD_ERROR("密码错误"),
+    ACCOUNT_TYPE_ERROR("账号类型不匹配"),
 
     /**
      * 手机号格式错误

snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java

@@ -244,8 +244,8 @@ public class AuthServiceImpl implements AuthService {
             if(ObjectUtil.isEmpty(saBaseLoginUser)) {
                 throw new CommonException(AuthExceptionEnum.ACCOUNT_ERROR.getValue());
             }
-            if (authAccountPasswordLoginParam.getAccountType()!= 0 && !saBaseLoginUser.getAccountType().equals(authAccountPasswordLoginParam.getAccountType())){
-                throw new CommonException("账号类型不匹配");
+            if ( !saBaseLoginUser.getAccountType().equals(authAccountPasswordLoginParam.getAccountType())){
+                throw new CommonException(AuthExceptionEnum.ACCOUNT_TYPE_ERROR.getValue());
             }
             if (!saBaseLoginUser.getPassword().equals(passwordHash)) {
                 // 记录登录次数 和 过期时间