diff --git a/aidex-controller/src/main/java/com/aidex/web/controller/system/SysUserController.java b/aidex-controller/src/main/java/com/aidex/web/controller/system/SysUserController.java index 28b41c307be0b888369af409644a7a066eb6d3c8..2eee63a3a98e72180051a251d436996556806cf3 100644 --- a/aidex-controller/src/main/java/com/aidex/web/controller/system/SysUserController.java +++ b/aidex-controller/src/main/java/com/aidex/web/controller/system/SysUserController.java @@ -147,10 +147,9 @@ public class SysUserController extends BaseController { @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") public R resetPwd(@RequestBody SysUser user) { - userService.checkUserAllowed(user); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - user.setUpdateBy(SecurityUtils.getUsername()); - return R.status(userService.resetPwd(user)); + SysUser dbUser = userService.get(user.getId()); + userService.checkUserAllowed(dbUser); + return R.status(userService.resetUserPwd(dbUser.getUserName(),SecurityUtils.encryptPassword(user.getPassword()))); } /** diff --git a/aidex-system/src/main/java/com/aidex/system/service/ISysUserService.java b/aidex-system/src/main/java/com/aidex/system/service/ISysUserService.java index 6235254e9903b8ec0b82bc68fc2c1e56ecbca01e..360cf37ab6d59af66083642a698b02d1292c59c5 100644 --- a/aidex-system/src/main/java/com/aidex/system/service/ISysUserService.java +++ b/aidex-system/src/main/java/com/aidex/system/service/ISysUserService.java @@ -131,14 +131,6 @@ public interface ISysUserService extends BaseService @Transactional(readOnly = false) public boolean updateUserAvatar(String userName, String avatar); - /** - * 重置用户密码 - * - * @param user 用户信息 - * @return 结果 - */ - public boolean resetPwd(SysUser user); - /** * 重置用户密码 * diff --git a/aidex-system/src/main/java/com/aidex/system/service/impl/SysUserServiceImpl.java b/aidex-system/src/main/java/com/aidex/system/service/impl/SysUserServiceImpl.java index 148a66d2582487cb55cec72fdc626ff85cb4abf0..f2b6faec810992d149901713cc342b17e872e484 100644 --- a/aidex-system/src/main/java/com/aidex/system/service/impl/SysUserServiceImpl.java +++ b/aidex-system/src/main/java/com/aidex/system/service/impl/SysUserServiceImpl.java @@ -303,19 +303,6 @@ public class SysUserServiceImpl extends BaseServiceImpl return mapper.updateUserAvatar(userName, avatar) > 0 ? true : false; } - /** - * 重置用户密码 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - @Transactional(readOnly = false) - public boolean resetPwd(SysUser user) - { - return super.save(user); - } - /** * 重置用户密码 *