fix: 修复修改用户信息时会将用户密码同步修改

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);

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"})

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);
 

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);
 

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) {

inspect-management/src/main/resources/mapper/system/SysUserMapper.xml

@@ -225,7 +225,6 @@
             <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
             <if test="sex != null and sex != ''">sex = #{sex},</if>
             <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
-            <if test="password != null and password != ''">password = #{password},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
             <if test="loginDate != null">login_date = #{loginDate},</if>
@@ -252,7 +251,7 @@
         update sys_user
         set password         = #{password},
             pass_update_time = now()
-        where user_name = #{userName}
+        where user_id = #{userId}
     </update>
 
     <delete id="deleteUserById" parameterType="Long">