From 7d1c53f92738166c1ced1a796e2bc95d26d35fa0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 18 一月 2023 11:59:32 +0800
Subject: [PATCH] update 优化 修改 oss 配置页面开关说明 避免造成误解
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
index 3b37ae9..157bb53 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
@@ -1,6 +1,10 @@
package com.ruoyi.system.mapper;
-import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
@@ -23,10 +27,10 @@
/**
* 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
*
- * @param menu 鑿滃崟淇℃伅
+ * @param queryWrapper 鏌ヨ鏉′欢
* @return 鑿滃崟鍒楄〃
*/
- List<SysMenu> selectMenuListByUserId(SysMenu menu);
+ List<SysMenu> selectMenuListByUserId(@Param(Constants.WRAPPER) Wrapper<SysMenu> queryWrapper);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
@@ -37,11 +41,26 @@
List<String> selectMenuPermsByUserId(Long userId);
/**
+ * 鏍规嵁瑙掕壊ID鏌ヨ鏉冮檺
+ *
+ * @param roleId 瑙掕壊ID
+ * @return 鏉冮檺鍒楄〃
+ */
+ List<String> selectMenuPermsByRoleId(Long roleId);
+
+ /**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
*
* @return 鑿滃崟鍒楄〃
*/
- List<SysMenu> selectMenuTreeAll();
+ default List<SysMenu> selectMenuTreeAll() {
+ LambdaQueryWrapper<SysMenu> lqw = new LambdaQueryWrapper<SysMenu>()
+ .in(SysMenu::getMenuType, UserConstants.TYPE_DIR, UserConstants.TYPE_MENU)
+ .eq(SysMenu::getStatus, UserConstants.MENU_NORMAL)
+ .orderByAsc(SysMenu::getParentId)
+ .orderByAsc(SysMenu::getOrderNum);
+ return this.selectList(lqw);
+ }
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
--
Gitblit v1.9.3