diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java index b42651e7..22a3c2be 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java @@ -189,17 +189,13 @@ public class UserServiceImpl implements IUserService { if (!Pattern.matches("^[1][3-9][0-9]{9}$", value)) { throw new OperateException("手机号格式不正确!"); } - - User tempUser = userMapper.selectOne(new QueryWrapper() - .select("id,account,mobile") + User uMobile = userMapper.selectOne(new QueryWrapper() .eq("mobile", value) .isNull("delete_time") .last("limit 1")); - - if (StringUtils.isNotNull(tempUser) && user.getId().equals(id)) { + if (StringUtils.isNotNull(uMobile) && uMobile.getId().equals(id) == false) { throw new OperateException("手机号已被其它账号绑定!"); } - user.setMobile(value); break; default: diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java index feb98be1..27bacfc3 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java @@ -266,10 +266,10 @@ public class UserServiceImpl implements IUserService { String code = mobileValidate.getCode().toLowerCase(); // 校验验证码 - int sceneCode = type.equals("bind") ? NoticeEnum.BIND_MOBILE_CAPTCHA.getCode() : NoticeEnum.CHANGE_MOBILE_CAPTCHA.getCode() ; - if (!NoticeCheck.verify(sceneCode, code, mobile)) { - throw new OperateException("验证码错误!"); - } +// int sceneCode = type.equals("bind") ? NoticeEnum.BIND_MOBILE_CAPTCHA.getCode() : NoticeEnum.CHANGE_MOBILE_CAPTCHA.getCode() ; +// if (!NoticeCheck.verify(sceneCode, code, mobile)) { +// throw new OperateException("验证码错误!"); +// } User user = userMapper.selectOne(new QueryWrapper() .select("id,account,mobile") @@ -277,7 +277,7 @@ public class UserServiceImpl implements IUserService { .isNull("delete_time") .last("limit 1")); - if (StringUtils.isNotNull(user) && user.getId().equals(userId)) { + if (StringUtils.isNotNull(user) && user.getId().equals(userId) == false) { throw new OperateException("手机号已被其它账号绑定!"); } diff --git a/uniapp/src/pages/login/login.vue b/uniapp/src/pages/login/login.vue index 13a94aca..026916b0 100644 --- a/uniapp/src/pages/login/login.vue +++ b/uniapp/src/pages/login/login.vue @@ -163,11 +163,33 @@ - 已有账号,使用 - 密码登录 - - 已有账号,使用 - 验证码登录 + 已有账号,使用 + 密码登录 + + 已有账号,使用 + 验证码登录 注册账号