menu

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -171,6 +171,7 @@ public class MenuController {
     @GetMapping("/simple-tree")
     @ApiOperation(value = "获取所有菜单（树结构）")
     public R menuAuthTree(@Valid MenuTreeDto dto) {
+        dto.setDisplay(null);
         List<MenuVo> list = menuService.getAuthMenuList(dto);
         List<MenuSimpleTreeVo> voList = BeanUtil.copyToList(list, MenuSimpleTreeVo.class);
         List<MenuSimpleTreeVo> treeVoList = TreeUtil.build(voList);

src/main/java/com/xjrsoft/module/system/dto/MenuTreeDto.java

@@ -30,4 +30,7 @@ public class MenuTreeDto {
     private String code;
 
     private Integer enabledMark;
+
+    // 菜单是否显示 0=隐藏 1=显示
+    private Integer display = 1;
 }

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -167,7 +167,7 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
                         .like(StrUtil.isNotBlank(dto.getCode()), Menu::getCode, dto.getCode())
                         .like(StrUtil.isNotBlank(dto.getName()), Menu::getName, dto.getName())
                         .eq(ObjectUtil.isNotEmpty(dto.getSystemType()), Menu::getSystemType, dto.getSystemType())
-                        .eq(Menu::getDisplay, 1) // 只查询显示菜单
+                        .eq(ObjectUtil.isNotEmpty(dto.getDisplay()),Menu::getDisplay, dto.getDisplay())
                         .in(CollectionUtils.isNotEmpty(authMenuIdList), Menu::getId, authMenuIdList)
                         .select(Menu::getId)
                         .selectAs(Subsystem::getName, MenuVo::getSystemName)