diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/Meta.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/Meta.java index 3730308..6378eb3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/Meta.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/Meta.java @@ -28,6 +28,8 @@ public class Meta { private Boolean isFull; + private Boolean showSidebar; + private Boolean isAffix = true; private Boolean isKeepAlive = true; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseMenu.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseMenu.java index b7855bb..71fb316 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseMenu.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseMenu.java @@ -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 menuList; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java index ae44c88..f6328af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java @@ -111,12 +111,13 @@ public class BaseMenuServiceImpl extends ServiceImpl i } List menuList = TreeUtil.formatModule(baseModules); // 查询相对应的菜单 - List baseMenus = baseMenuMapper.selectList(Wrappers.lambdaQuery().in(BaseMenu::getModuleId, - baseModules.stream().map(m -> m.getModuleId()).collect(Collectors.toList())).eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority)); + List menuIds = baseModuleService.queryBySelf(1); + List baseMenus = baseMenuMapper.selectList(Wrappers.lambdaQuery().in(BaseMenu::getMenuId, + menuIds).eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority)); menuList.addAll(TreeUtil.formatMenu(baseMenus)); // 查询相对应的按钮权限 - List baseAction = baseActionMapper.selectList(Wrappers.lambdaQuery().in(BaseAction::getMenuId, - baseMenus.stream().map(m -> m.getMenuId()).collect(Collectors.toList())).eq(BaseAction::getStatus, 1)); + List actionIds = baseModuleService.queryBySelf(2); + List baseAction = baseActionMapper.selectList(Wrappers.lambdaQuery().in(BaseAction::getActionId, actionIds).eq(BaseAction::getStatus, 1)); menuList.addAll(TreeUtil.formatAction(baseAction)); return TreeUtil.build(menuList, type, 0L, 1); } diff --git a/src/main/java/com/zhgd/xmgl/util/TreeUtil.java b/src/main/java/com/zhgd/xmgl/util/TreeUtil.java index db1ea82..efb954d 100644 --- a/src/main/java/com/zhgd/xmgl/util/TreeUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/TreeUtil.java @@ -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());