Merge remote-tracking branch 'origin/master'

puzhibing

2025-02-05 74b0e0814e37d640596f44ec86d20fa9ecce9ed6

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

@@ -256,13 +256,10 @@
        //删除旧的角色数据，添加新的角色
        userRoleService.remove(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, user.getUserId()));
        //添加新的角色数据
        Long[] roleIds = user.getRoleIds();
        for (Long roleId : roleIds) {
            SysUserRole userRole = new SysUserRole();
            userRole.setUserId(user.getUserId());
            userRole.setRoleId(roleId);
            userRoleService.save(userRole);
        }
        SysUserRole userRole = new SysUserRole();
        userRole.setUserId(user.getUserId());
        userRole.setRoleId(user.getRoleId());
        userRoleService.save(userRole);
        
        //删除旧的站点数据后添加新的
        userSiteClient.delUserSite(user.getUserId());