From 40854cc240ec3bc2e26e7c47a148651fefd02fdb Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Tue, 15 Sep 2026 16:03:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=97=B6=E4=BC=9A=E5=B0=86?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E5=90=8C=E6=AD=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/system/controller/SysProfileController.java | 3 ++- .../com/inspect/system/controller/SysUserController.java | 3 ++- .../java/com/inspect/system/mapper/SysUserMapper.java | 2 +- .../java/com/inspect/system/service/ISysUserService.java | 4 +--- .../inspect/system/service/impl/SysUserServiceImpl.java | 9 +++------ .../src/main/resources/mapper/system/SysUserMapper.xml | 3 +-- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/inspect-management/src/main/java/com/inspect/system/controller/SysProfileController.java b/inspect-management/src/main/java/com/inspect/system/controller/SysProfileController.java index 56120ca..079d0de 100644 --- a/inspect-management/src/main/java/com/inspect/system/controller/SysProfileController.java +++ b/inspect-management/src/main/java/com/inspect/system/controller/SysProfileController.java @@ -88,13 +88,14 @@ public class SysProfileController extends BaseController { @PostMapping({"/updatePwd"}) public AjaxResult updatePwd(String oldPassword, String newPassword) { String username = SecurityUtils.getUsername(); + Long userId = SecurityUtils.getUserId(); SysUser user = this.userService.selectUserByUserName(username); String password = user.getPassword(); if (!SecurityUtils.matchesPassword(oldPassword, password)) { return AjaxResult.error("修改密码失败，旧密码错误"); } else if (SecurityUtils.matchesPassword(newPassword, password)) { return AjaxResult.error("新密码不能与旧密码相同"); - } else if (this.userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) { + } else if (this.userService.resetUserPwd(userId, SecurityUtils.encryptPassword(newPassword)) > 0) { LoginUser loginUser = SecurityUtils.getLoginUser(); String userKey = this.tokenService.getTokenKey(loginUser.getToken()); this.redisService.deleteObject(userKey); diff --git a/inspect-management/src/main/java/com/inspect/system/controller/SysUserController.java b/inspect-management/src/main/java/com/inspect/system/controller/SysUserController.java index 4def5ea..9170725 100644 --- a/inspect-management/src/main/java/com/inspect/system/controller/SysUserController.java +++ b/inspect-management/src/main/java/com/inspect/system/controller/SysUserController.java @@ -216,7 +216,8 @@ public class SysUserController extends BaseController { this.userService.checkUserDataScope(user.getUserId()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setUpdateBy(SecurityUtils.getUsername()); - return this.toAjax(this.userService.resetPwd(user)); + logger.info("user:{}", user); + return this.toAjax(this.userService.resetUserPwd(user.getUserId(), user.getPassword())); } @RequiresPermissions({"system:user:edit"}) diff --git a/inspect-management/src/main/java/com/inspect/system/mapper/SysUserMapper.java b/inspect-management/src/main/java/com/inspect/system/mapper/SysUserMapper.java index f12431c..a390c29 100644 --- a/inspect-management/src/main/java/com/inspect/system/mapper/SysUserMapper.java +++ b/inspect-management/src/main/java/com/inspect/system/mapper/SysUserMapper.java @@ -25,7 +25,7 @@ public interface SysUserMapper { int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); - int resetUserPwd(@Param("userName") String userName, @Param("password") String password); + int resetUserPwd(@Param("userId") Long userId, @Param("password") String password); int deleteUserById(Long id); diff --git a/inspect-management/src/main/java/com/inspect/system/service/ISysUserService.java b/inspect-management/src/main/java/com/inspect/system/service/ISysUserService.java index abdb7cf..28363cc 100644 --- a/inspect-management/src/main/java/com/inspect/system/service/ISysUserService.java +++ b/inspect-management/src/main/java/com/inspect/system/service/ISysUserService.java @@ -44,9 +44,7 @@ public interface ISysUserService { boolean updateUserAvatar(String username, String url); - int resetPwd(SysUser sysUser); - - int resetUserPwd(String username, String password); + int resetUserPwd(Long userId, String password); int deleteUserById(Long userId); diff --git a/inspect-management/src/main/java/com/inspect/system/service/impl/SysUserServiceImpl.java b/inspect-management/src/main/java/com/inspect/system/service/impl/SysUserServiceImpl.java index e5719f5..136c921 100644 --- a/inspect-management/src/main/java/com/inspect/system/service/impl/SysUserServiceImpl.java +++ b/inspect-management/src/main/java/com/inspect/system/service/impl/SysUserServiceImpl.java @@ -183,12 +183,9 @@ public class SysUserServiceImpl implements ISysUserService { return this.userMapper.updateUserAvatar(userName, avatar) > 0; } - public int resetPwd(SysUser user) { - return this.userMapper.updateUser(user); - } - - public int resetUserPwd(String userName, String password) { - return this.userMapper.resetUserPwd(userName, password); + @Override + public int resetUserPwd(Long userId, String password) { + return this.userMapper.resetUserPwd(userId, password); } public void insertUserRole(SysUser user) { diff --git a/inspect-management/src/main/resources/mapper/system/SysUserMapper.xml b/inspect-management/src/main/resources/mapper/system/SysUserMapper.xml index 0e9269d..711e636 100644 --- a/inspect-management/src/main/resources/mapper/system/SysUserMapper.xml +++ b/inspect-management/src/main/resources/mapper/system/SysUserMapper.xml @@ -225,7 +225,6 @@ phonenumber = #{phonenumber}, sex = #{sex}, avatar = #{avatar}, - password = #{password}, status = #{status}, login_ip = #{loginIp}, login_date = #{loginDate}, @@ -252,7 +251,7 @@ update sys_user set password = #{password}, pass_update_time = now() - where user_name = #{userName} + where user_id = #{userId}