菜单修改

This commit is contained in:
pengjie 2023-10-09 11:37:50 +08:00
parent c057ac24e9
commit ae03cc1dc3
4 changed files with 11 additions and 4 deletions

View File

@ -28,6 +28,8 @@ public class Meta {
private Boolean isFull;
private Boolean showSidebar;
private Boolean isAffix = true;
private Boolean isKeepAlive = true;

View File

@ -107,6 +107,9 @@ public class BaseMenu implements Serializable {
@ApiModelProperty(value = "菜单是否全屏(默认否)")
private Boolean isFull;
@ApiModelProperty(value = "菜单是否显示侧边栏")
private Boolean showSidebar;
@TableField(exist = false)
@ApiModelProperty(value = "子集菜单")
private List<BaseMenu> menuList;

View File

@ -111,12 +111,13 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
}
List<MenuTreeDto> menuList = TreeUtil.formatModule(baseModules);
// 查询相对应的菜单
List<BaseMenu> baseMenus = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getModuleId,
baseModules.stream().map(m -> m.getModuleId()).collect(Collectors.toList())).eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority));
List<Long> menuIds = baseModuleService.queryBySelf(1);
List<BaseMenu> baseMenus = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getMenuId,
menuIds).eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority));
menuList.addAll(TreeUtil.formatMenu(baseMenus));
// 查询相对应的按钮权限
List<BaseAction> baseAction = baseActionMapper.selectList(Wrappers.<BaseAction>lambdaQuery().in(BaseAction::getMenuId,
baseMenus.stream().map(m -> m.getMenuId()).collect(Collectors.toList())).eq(BaseAction::getStatus, 1));
List<Long> actionIds = baseModuleService.queryBySelf(2);
List<BaseAction> baseAction = baseActionMapper.selectList(Wrappers.<BaseAction>lambdaQuery().in(BaseAction::getActionId, actionIds).eq(BaseAction::getStatus, 1));
menuList.addAll(TreeUtil.formatAction(baseAction));
return TreeUtil.build(menuList, type, 0L, 1);
}

View File

@ -44,6 +44,7 @@ public class TreeUtil {
meta.setIcon(menu.getIcon());
meta.setTitle(menu.getMenuName());
meta.setIsFull(menu.getIsFull());
meta.setShowSidebar(menu.getShowSidebar());
node.setMeta(meta);
node.setName(menu.getMenuId());
node.setComponent(menu.getPath());