首页-设置常用菜单

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java

@@ -23,6 +23,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 菜单信息
@@ -47,6 +48,15 @@ public class SysMenuController extends BaseController {
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId());
         return R.ok(menuService.buildMenus(menus));
     }
+    @GetMapping("/getVisibleMenus")
+    public R<List<SysMenuVo>> getVisibleMenus() {
+        SysMenuBo menu = new SysMenuBo();
+        menu.setVisible(UserConstants.NORMAL);
+        menu.setStatus(UserConstants.MENU_NORMAL);
+        List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
+        List<SysMenuVo> rs = menus.stream().filter(e -> StringUtils.equals(e.getMenuType(), UserConstants.TYPE_MENU)).toList();
+        return R.ok(rs);
+    }
 
     /**
      * 获取菜单列表

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java

@@ -71,16 +71,21 @@ public class SysMenuServiceImpl implements ISysMenuService {
                 .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
                 .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
                 .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+                .eq(SysMenu::getDelFlag, "0")
                 .orderByAsc(SysMenu::getParentId)
-                .orderByAsc(SysMenu::getOrderNum));
+                .orderByAsc(SysMenu::getOrderNum)
+                .orderByDesc(SysMenu::getCreateTime));
+
         } else {
             QueryWrapper<SysMenu> wrapper = Wrappers.query();
             wrapper.inSql("r.role_id", "select role_id from sys_user_role where user_id = " + userId)
                 .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName())
                 .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible())
                 .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus())
+                .eq("m.del_flag", "0")
                 .orderByAsc("m.parent_id")
-                .orderByAsc("m.order_num");
+                .orderByAsc("m.order_num")
+                .orderByDesc("m.create_time");
             List<SysMenu> list = baseMapper.selectMenuListByUserId(wrapper);
             menuList = MapstructUtils.convert(list, SysMenuVo.class);
         }