From 86dff1d678838a157c1cf67cdd9381e40d7af96e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 13 Jun 2023 11:45:38 +0800
Subject: [PATCH] app多角色菜单权限合并

---
 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.java
index 1e25845..fee1737 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.java
@@ -62,10 +62,10 @@
 
 	/**
 	 * 授权树形结构
-	 *
+	 * @param param 查询参数
 	 * @return
 	 */
-	List<TreeNode> grantTree();
+	List<TreeNode> grantTree(@Param("param")Map<String, Object> param);
 
 	/**
 	 * 授权树形结构
@@ -183,9 +183,17 @@
 	 */
 	List<MenuDTO> authRoutes(List<Long> roleIds);
 
-	List<MenuVO> selectAppMenu(@Param("roleId") String roleId);
+	List<MenuVO> selectAppMenu(@Param("ids") String[] ids);
 
 	WebMenuVO selectWebTopMenu();
 
 	List<WebMenuVO> getChildrenListById(@Param("id")String id,@Param("roleId") String roleId);
+
+	List<MenuVO> getButtonList(@Param("roleIds") List<Long> roleIds);
+
+	/**
+	 * 查询菜单列表(排除 web,app 之外的菜单)
+	 * @return
+	 */
+	List<TreeNode> grantTreeNew();
 }

--
Gitblit v1.9.3