无关风月
2024-06-17 34e183fbfed4688f25b375d4966b937f52228827
报错
6个文件已修改
26 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
@@ -26,11 +26,6 @@
            }
            @Override
            public R<Boolean> updateSysUser(SysUser sysUser) {
                return R.fail("更新用户失败:" + cause.getMessage());
            }
            @Override
            public R<List<Integer>> companySaveSysUser(CompanyAddSysUserDto dto) {
                return R.fail("添加用户失败:" + cause.getMessage());
            }
ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -23,8 +23,8 @@
    @PostMapping("/user/getSysUser")
    R<SysUser> getSysUser(Long userId);
    @PostMapping("/user/updateSysUser")
    R<Boolean>  updateSysUser(@RequestBody SysUser sysUser);
//    @PostMapping("/user/updateSysUser")
//    R<Boolean>  updateSysUser(@RequestBody SysUser sysUser);
    @PostMapping("/user/companySaveSysUser")
    R<List<Integer>> companySaveSysUser(@RequestBody CompanyAddSysUserDto dto);
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
@@ -25,10 +25,7 @@
                return R.fail("获取用户失败:" + cause.getMessage());
            }
            @Override
            public R<Boolean> updateSysUser(SysUser sysUser) {
                return R.fail("更新用户失败:" + cause.getMessage());
            }
            @Override
            public R<List<Integer>> companySaveSysUser(CompanyAddSysUserDto dto) {
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -23,8 +23,8 @@
    @PostMapping("/user/getSysUser")
    R<SysUser> getSysUser(Long userId);
    @PostMapping("/user/updateSysUser")
    R<Boolean>  updateSysUser(@RequestBody SysUser sysUser);
//    @PostMapping("/user/updateSysUser")
//    R<Boolean>  updateSysUser(@RequestBody SysUser sysUser);
    @PostMapping("/user/companySaveSysUser")
    R<List<Integer>> companySaveSysUser(@RequestBody CompanyAddSysUserDto dto);
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -63,7 +63,7 @@
        sysUser.setUserId(userInfo.getSysUser().getUserId());
        sysUser.setLoginDate(new Date());
        System.out.println("修改用户登录时间"+sysUser);
        userClient.updateSysUser(sysUser);
//        userClient.updateSysUser(sysUser);
        // 获取登录token
        return R.ok(map);
    }
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -179,9 +179,9 @@
        // 获取所有菜单ids
        List<Long> menusId1 = menuMapper.selectList(new LambdaQueryWrapper<SysMenu>()).stream().map(SysMenu::getMenuId).collect(Collectors.toList());
//        if(menusId.size()==0){
//            return AjaxResult.success(new ArrayList<>());
//        }
        if(CollectionUtils.isEmpty(menusId)){
            return AjaxResult.success(new ArrayList<>());
        }
        //获取所有的权限菜单
        List<SysMenus> all = menuMapper.getAllInIds(menusId1);