用户密码登陆冻结提示

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -704,6 +704,8 @@ public class UserController implements IBaseController {
     private JsonResult loginWithHttpBasic(Long channelId, String appChannel, Long createdFrom, Merchant merchant, String dimension, Long geetestLogId, HttpServletRequest request) {
         User user = verificateUserNameAndPassword(request);
         if (user == null) {
+            return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
+        }  else if (!user.getEnable()) {
             return JsonResult.buildErrorStateResult(USER_ERROR_OR_ENABLE_ERROR, null);
         } else if (!wechatRelateUserIfNecessary(user, request)) {
             return JsonResult.buildErrorStateResult("登录时微信关联失败", null);
@@ -744,7 +746,7 @@ public class UserController implements IBaseController {
         String phoneNo = credentialArr[0];
         String pass = credentialArr[1];
         User user = userService.findByPhoneWithCache(phoneNo);
-        if (user == null || !user.getEnable()) {
+        if (user == null) {
             // 向该ipv4添加错误计数器
             lockIpv4Service.countErrorByIpv4(clientIp);
             // 向该phoneNo添加错误计数器