From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +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 | 19 ++++++++++++++++---
1 files changed, 16 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 060cb82..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
@@ -19,6 +19,7 @@
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;
@@ -61,10 +62,10 @@
/**
* 授权树形结构
- *
+ * @param param 查询参数
* @return
*/
- List<TreeNode> grantTree();
+ List<TreeNode> grantTree(@Param("param")Map<String, Object> param);
/**
* 授权树形结构
@@ -182,5 +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