From a8d11819563fcd3d237f354574ccadb92ccf57e4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 May 2023 20:15:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 454700f..c192e97 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
@@ -19,7 +19,9 @@
import cn.gistack.system.dto.MenuDTO;
import cn.gistack.system.entity.Menu;
import cn.gistack.system.vo.MenuVO;
+import cn.gistack.system.vo.WebMenuVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.core.tool.node.TreeNode;
import java.util.List;
@@ -60,10 +62,10 @@
/**
* 授权树形结构
- *
+ * @param param 查询参数
* @return
*/
- List<TreeNode> grantTree();
+ List<TreeNode> grantTree(@Param("param")Map<String, Object> param);
/**
* 授权树形结构
@@ -180,4 +182,18 @@
* @return
*/
List<MenuDTO> authRoutes(List<Long> roleIds);
+
+ List<MenuVO> selectAppMenu(@Param("roleId") String roleId);
+
+ 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