lbqms.git - Gitblit

			@@ -11,6 +11,7 @@
			import org.dromara.common.idempotent.annotation.RepeatSubmit;
			import org.dromara.common.log.annotation.Log;
			import org.dromara.common.log.enums.BusinessType;
			import org.dromara.common.mybatis.helper.DataPermissionHelper;
			import org.dromara.common.satoken.utils.LoginHelper;
			import org.dromara.common.web.core.BaseController;
			import org.dromara.system.domain.bo.SysUserBo;
			@@ -62,7 +63,7 @@
			@RepeatSubmit
			@Log(title = "个人信息", businessType = BusinessType.UPDATE)
			@PutMapping
			public R<Void> updateProfile(@RequestBody SysUserProfileBo profile) {
			public R<Void> updateProfile(@Validated @RequestBody SysUserProfileBo profile) {
			SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class);
			user.setUserId(LoginHelper.getUserId());
			String username = LoginHelper.getUsername();
			@@ -72,7 +73,8 @@
			if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
			return R.fail("修改用户'" + username + "'失败，邮箱账号已存在");
			}
			if (userService.updateUserProfile(user) > 0) {
			int rows = DataPermissionHelper.ignore(() -> userService.updateUserProfile(user));
			if (rows > 0) {
			return R.ok();
			}
			return R.fail("修改个人信息异常，请联系管理员");
			@@ -96,8 +98,8 @@
			if (BCrypt.checkpw(bo.getNewPassword(), password)) {
			return R.fail("新密码不能与旧密码相同");
			}

			if (userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(bo.getNewPassword())) > 0) {
			int rows = DataPermissionHelper.ignore(() -> userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(bo.getNewPassword())));
			if (rows > 0) {
			return R.ok();
			}
			return R.fail("修改密码异常，请联系管理员");
			@@ -119,7 +121,8 @@
			}
			SysOssVo oss = ossService.upload(avatarfile);
			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.setImgUrl(avatar);
			return R.ok(avatarVo);