|
|
@@ -314,7 +314,13 @@ public class UpdateUserController extends BaseController {
|
|
|
}
|
|
|
Long userUU = (Long) existToken.getBind();
|
|
|
User user = userService.findOne(userUU);
|
|
|
- tokenService.delete(token);
|
|
|
+
|
|
|
+ if (!email.equals(user.getEmail())) {
|
|
|
+ List<User> users = userService.findByEmail(email);
|
|
|
+ if (!CollectionUtils.isEmpty(users)) {
|
|
|
+ return error("该邮箱已被注册");
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
// 设置发送邮件信息
|
|
|
Map<String, Object> tokenMap = new HashMap<>(2);
|
|
|
@@ -341,6 +347,8 @@ public class UpdateUserController extends BaseController {
|
|
|
mailService.send(mailTplId.getValue(), email, data);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ tokenService.delete(token);
|
|
|
return success();
|
|
|
}
|
|
|
|