Merge remote-tracking branch 'origin/master'

xuhy

2025-01-16 9fde9f917552f659d41fcfce5094f429a29b8ead

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java

@@ -107,7 +107,12 @@
        System.err.println(oldPassword);
        System.err.println(newPassword);
//        String username = SecurityUtils.getUsername();
        SysUser user = userService.selectUserByUserName(username);
        SysUser user =null;
        if (updatePassword.getType()==1){
            user = userService.selectUserByUserName(username);
        }else{
            user = userService.selectUserShopByUserName(username);
        }
        if (Objects.isNull(user))
        {
            return error("未查询到该账号");
@@ -121,8 +126,15 @@
        {
            return error("新密码不能与旧密码相同");
        }
        if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0)
        {
        if (updatePassword.getType()==1&&userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) {
            // 更新缓存用户密码
//            LoginUser loginUser = SecurityUtils.getLoginUser();
//            SysUser sysUser = loginUser.getSysUser();
//            loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword));
//            tokenService.setLoginUser(loginUser);
            return success();
        }
        if (updatePassword.getType()==2&&userService.resetUserShopPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) {
            // 更新缓存用户密码
//            LoginUser loginUser = SecurityUtils.getLoginUser();
//            SysUser sysUser = loginUser.getSysUser();