菜单修改
This commit is contained in:
parent
c057ac24e9
commit
ae03cc1dc3
@ -28,6 +28,8 @@ public class Meta {
|
|||||||
|
|
||||||
private Boolean isFull;
|
private Boolean isFull;
|
||||||
|
|
||||||
|
private Boolean showSidebar;
|
||||||
|
|
||||||
private Boolean isAffix = true;
|
private Boolean isAffix = true;
|
||||||
|
|
||||||
private Boolean isKeepAlive = true;
|
private Boolean isKeepAlive = true;
|
||||||
|
|||||||
@ -107,6 +107,9 @@ public class BaseMenu implements Serializable {
|
|||||||
@ApiModelProperty(value = "菜单是否全屏(默认否)")
|
@ApiModelProperty(value = "菜单是否全屏(默认否)")
|
||||||
private Boolean isFull;
|
private Boolean isFull;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "菜单是否显示侧边栏")
|
||||||
|
private Boolean showSidebar;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "子集菜单")
|
@ApiModelProperty(value = "子集菜单")
|
||||||
private List<BaseMenu> menuList;
|
private List<BaseMenu> menuList;
|
||||||
|
|||||||
@ -111,12 +111,13 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
|
|||||||
}
|
}
|
||||||
List<MenuTreeDto> menuList = TreeUtil.formatModule(baseModules);
|
List<MenuTreeDto> menuList = TreeUtil.formatModule(baseModules);
|
||||||
// 查询相对应的菜单
|
// 查询相对应的菜单
|
||||||
List<BaseMenu> baseMenus = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getModuleId,
|
List<Long> menuIds = baseModuleService.queryBySelf(1);
|
||||||
baseModules.stream().map(m -> m.getModuleId()).collect(Collectors.toList())).eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority));
|
List<BaseMenu> baseMenus = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getMenuId,
|
||||||
|
menuIds).eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority));
|
||||||
menuList.addAll(TreeUtil.formatMenu(baseMenus));
|
menuList.addAll(TreeUtil.formatMenu(baseMenus));
|
||||||
// 查询相对应的按钮权限
|
// 查询相对应的按钮权限
|
||||||
List<BaseAction> baseAction = baseActionMapper.selectList(Wrappers.<BaseAction>lambdaQuery().in(BaseAction::getMenuId,
|
List<Long> actionIds = baseModuleService.queryBySelf(2);
|
||||||
baseMenus.stream().map(m -> m.getMenuId()).collect(Collectors.toList())).eq(BaseAction::getStatus, 1));
|
List<BaseAction> baseAction = baseActionMapper.selectList(Wrappers.<BaseAction>lambdaQuery().in(BaseAction::getActionId, actionIds).eq(BaseAction::getStatus, 1));
|
||||||
menuList.addAll(TreeUtil.formatAction(baseAction));
|
menuList.addAll(TreeUtil.formatAction(baseAction));
|
||||||
return TreeUtil.build(menuList, type, 0L, 1);
|
return TreeUtil.build(menuList, type, 0L, 1);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -44,6 +44,7 @@ public class TreeUtil {
|
|||||||
meta.setIcon(menu.getIcon());
|
meta.setIcon(menu.getIcon());
|
||||||
meta.setTitle(menu.getMenuName());
|
meta.setTitle(menu.getMenuName());
|
||||||
meta.setIsFull(menu.getIsFull());
|
meta.setIsFull(menu.getIsFull());
|
||||||
|
meta.setShowSidebar(menu.getShowSidebar());
|
||||||
node.setMeta(meta);
|
node.setMeta(meta);
|
||||||
node.setName(menu.getMenuId());
|
node.setName(menu.getMenuId());
|
||||||
node.setComponent(menu.getPath());
|
node.setComponent(menu.getPath());
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user