|
@@ -51,7 +51,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
|
@ApiOperation("用户菜单树")
|
|
|
public R<List<SysMenuDto.Vo>> workMenu(@RequestBody @Validated SysMenuDto.WorkMenu workMenu) {
|
|
|
List<SysMenuDto.Vo> list = new ArrayList<>();
|
|
|
- List<SysMenuJoinSysRoleMenu> menus = RedisCache.getMenuTree(workMenu.getSystemId());
|
|
|
+ List<SysMenuJoinSysRoleMenu> menus = RedisCache.getMenuTree(workMenu.getSysId());
|
|
|
menus.forEach(sysMenuJoinSysRoleMenu -> {
|
|
|
SysMenuDto.Vo vo = copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu);
|
|
|
List<SysMenuDto.Vo> sonVos = copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu.getSonSysMenu());
|
|
@@ -64,7 +64,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
|
@ApiOperation("用户菜单集合")
|
|
|
public R<List<SysMenuDto.Vo>> workMenuList(@RequestBody @Validated SysMenuDto.WorkMenu workMenu) {
|
|
|
List<SysMenuDto.Vo> list = new ArrayList<>();
|
|
|
- List<SysMenuJoinSysRoleMenu> menus = RedisCache.getMenu(workMenu.getSystemId());
|
|
|
+ List<SysMenuJoinSysRoleMenu> menus = RedisCache.getMenu(workMenu.getSysId());
|
|
|
menus.forEach(sysMenuJoinSysRoleMenu -> list.add(copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu)));
|
|
|
return R.ok(list);
|
|
|
}
|
|
@@ -72,7 +72,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
|
@PostMapping("menu")
|
|
|
@ApiOperation("全部菜单树")
|
|
|
public R<List<SysMenuDto.Vo>> menu(@RequestBody @Validated SysMenuDto.WorkMenu workMenu) {
|
|
|
- List<SysMenuDto.Vo> vos = copy(SysMenuDto.Vo.class, list(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getSysId, workMenu.getSystemId())));
|
|
|
+ List<SysMenuDto.Vo> vos = copy(SysMenuDto.Vo.class, list(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getSysId, workMenu.getSysId())));
|
|
|
JList<SysMenuDto.Vo> list = new JArrayList<>(vos).filter().isNull(SysMenuDto.Vo::getPaterId).list();
|
|
|
for (SysMenuDto.Vo vo : list) {
|
|
|
List<SysMenuDto.Vo> tree = tree(vo, vos, SysMenuDto.Vo::getId, SysMenuDto.Vo::getPaterId, SysMenuDto.Vo::getSonSysMenu);
|