!619 fix 修复数据权限导致的个人中心的修改头像和修改密码接口错误
Merge pull request !619 from QianRj/dev
This commit is contained in:
commit
591f86e4e9
@ -98,8 +98,8 @@ public class SysProfileController extends BaseController {
|
|||||||
if (BCrypt.checkpw(bo.getNewPassword(), password)) {
|
if (BCrypt.checkpw(bo.getNewPassword(), password)) {
|
||||||
return R.fail("新密码不能与旧密码相同");
|
return R.fail("新密码不能与旧密码相同");
|
||||||
}
|
}
|
||||||
|
int rows = DataPermissionHelper.ignore(() -> userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(bo.getNewPassword())));
|
||||||
if (userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(bo.getNewPassword())) > 0) {
|
if (rows > 0) {
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
return R.fail("修改密码异常,请联系管理员");
|
return R.fail("修改密码异常,请联系管理员");
|
||||||
@ -121,7 +121,8 @@ public class SysProfileController extends BaseController {
|
|||||||
}
|
}
|
||||||
SysOssVo oss = ossService.upload(avatarfile);
|
SysOssVo oss = ossService.upload(avatarfile);
|
||||||
String avatar = oss.getUrl();
|
String avatar = oss.getUrl();
|
||||||
if (userService.updateUserAvatar(LoginHelper.getUserId(), oss.getOssId())) {
|
boolean updateSuccess = DataPermissionHelper.ignore(() -> userService.updateUserAvatar(LoginHelper.getUserId(), oss.getOssId()));
|
||||||
|
if (updateSuccess) {
|
||||||
AvatarVo avatarVo = new AvatarVo();
|
AvatarVo avatarVo = new AvatarVo();
|
||||||
avatarVo.setImgUrl(avatar);
|
avatarVo.setImgUrl(avatar);
|
||||||
return R.ok(avatarVo);
|
return R.ok(avatarVo);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user