修复获取菜单列表接口bug

dsk-admin/src/main/java/com/dsk/web/controller/system/SysMenuController.java

@@ -39,8 +39,7 @@ public class SysMenuController extends BaseController {
     @SaCheckPermission("system:menu:list")
     @GetMapping("/list")
     public R<List<SysMenu>> list(SysMenu menu) {
-        List<SysMenu> menus = menuService.selectAllMenu(menu,getUserId());
-        //List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
         return R.ok(menus);
     }
 

dsk-system/src/main/java/com/dsk/system/service/ISysMenuService.java

@@ -13,13 +13,6 @@ import java.util.Set;
  * @author Lion Li
  */
 public interface ISysMenuService {
-    /**
-     * 根据用户查询全部系统菜单列表
-     *
-     * @param userId 用户ID
-     * @return 菜单列表
-     */
-    List<SysMenu> selectAllMenu(SysMenu menu, Long userId);
 
     /**
      * 根据用户查询系统菜单列表

dsk-system/src/main/java/com/dsk/system/service/impl/SysMenuServiceImpl.java

@@ -40,25 +40,6 @@ public class SysMenuServiceImpl implements ISysMenuService {
     private final SysTenantMapper tenantMapper;
     private final SysTenantPackageMapper tenantPackageMapper;
 
-    /**
-     * 根据用户查询全部系统菜单列表
-     *
-     * @param userId 用户ID
-     * @return 菜单列表
-     */
-    @Override
-    public List<SysMenu> selectAllMenu(SysMenu menu, Long userId) {
-        List<SysMenu> menuList = null;
-        // 管理员显示所有菜单信息
-        if (LoginHelper.isSuperAdmin(userId)) {
-            menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
-                    .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
-                    .orderByAsc(SysMenu::getParentId)
-                    .orderByAsc(SysMenu::getOrderNum));
-        }
-        return menuList;
-    }
-
     /**
      * 根据用户查询系统菜单列表
      *
@@ -83,8 +64,8 @@ public class SysMenuServiceImpl implements ISysMenuService {
         if (LoginHelper.isSuperAdmin(userId)) {
             menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
                     .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
-                    .eq(SysMenu::getVisible, 0)
-                    .eq(SysMenu::getStatus, 0)
+                    //.eq(SysMenu::getVisible, 0)
+                    //.eq(SysMenu::getStatus, 0)
                     .orderByAsc(SysMenu::getParentId)
                     .orderByAsc(SysMenu::getOrderNum));
         } else {