From 1337f249608bcbd7ad6cf244870e560a95821727 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 12 十一月 2024 11:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuService.java |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuService.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuService.java
index 98b40a5..e7ca3b7 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuService.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuService.java
@@ -1,5 +1,6 @@
 package com.iailab.module.system.service.permission;
 
+
 import com.iailab.module.system.controller.admin.permission.vo.menu.MenuListReqVO;
 import com.iailab.module.system.controller.admin.permission.vo.menu.MenuSaveVO;
 import com.iailab.module.system.dal.dataobject.permission.MenuDO;
@@ -53,12 +54,37 @@
     List<MenuDO> getMenuListByTenant(MenuListReqVO reqVO);
 
     /**
+     * 基于租户,筛选应用菜单列表
+     * 注意,如果是系统租户,返回的还是全菜单
+     *
+     * @param reqVO 筛选条件请求 VO
+     * @return 应用菜单列表
+     */
+    List<MenuDO> getAppMenuListByTenant(MenuListReqVO reqVO);
+
+    /**
+     * 过滤掉关闭的菜单及其子菜单
+     *
+     * @param list 菜单列表
+     * @return 过滤后的菜单列表
+     */
+    List<MenuDO> filterDisableMenus(List<MenuDO> list);
+
+    /**
      * 筛选菜单列表
      *
      * @param reqVO 筛选条件请求 VO
      * @return 菜单列表
      */
     List<MenuDO> getMenuList(MenuListReqVO reqVO);
+
+    /**
+     * 筛选菜单列表
+     *
+     * @param reqVO 筛选条件请求 VO
+     * @return 菜单列表
+     */
+    List<MenuDO> getAppMenuList(Long tenantId, MenuListReqVO reqVO);
 
     /**
      * 获得权限对应的菜单编号数组
@@ -77,6 +103,14 @@
     MenuDO getMenu(Long id);
 
     /**
+     * 根据应用id获得菜单
+     *
+     * @param id 菜单编号
+     * @return 菜单
+     */
+    MenuDO getMenuByAppId(Long id);
+
+    /**
      * 获得菜单数组
      *
      * @param ids 菜单编号数组
@@ -84,4 +118,11 @@
      */
     List<MenuDO> getMenuList(Collection<Long> ids);
 
+    /**
+     * 根据父id查询菜单
+     * @param ids
+     * @return
+     */
+    List<MenuDO> selectListByParentId(Collection<Long> ids);
+
 }

--
Gitblit v1.9.3