From b9931cda30d13a02c29194bbf387f87b0a9d368b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 六月 2022 15:25:22 +0800
Subject: [PATCH] !192 优化登出方法 Merge pull request !192 from zendwang/dev
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 f54ceea..8844f27 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,7 +1,11 @@
package com.ruoyi.system.mapper;
+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.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -9,24 +13,24 @@
/**
* 鑿滃崟琛� 鏁版嵁灞�
*
- * @author ruoyi
+ * @author Lion Li
*/
-public interface SysMenuMapper extends BaseMapperPlus<SysMenu> {
+public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, SysMenu> {
/**
* 鏍规嵁鐢ㄦ埛鎵�鏈夋潈闄�
*
* @return 鏉冮檺鍒楄〃
*/
- public List<String> selectMenuPerms();
+ List<String> selectMenuPerms();
/**
* 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
*
- * @param menu 鑿滃崟淇℃伅
+ * @param queryWrapper 鏌ヨ鏉′欢
* @return 鑿滃崟鍒楄〃
*/
- public List<SysMenu> selectMenuListByUserId(SysMenu menu);
+ List<SysMenu> selectMenuListByUserId(@Param(Constants.WRAPPER) Wrapper<SysMenu> queryWrapper);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
@@ -34,14 +38,21 @@
* @param userId 鐢ㄦ埛ID
* @return 鏉冮檺鍒楄〃
*/
- public List<String> selectMenuPermsByUserId(Long userId);
+ List<String> selectMenuPermsByUserId(Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
*
* @return 鑿滃崟鍒楄〃
*/
- public 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鏌ヨ鑿滃崟
@@ -49,7 +60,7 @@
* @param userId 鐢ㄦ埛ID
* @return 鑿滃崟鍒楄〃
*/
- public List<SysMenu> selectMenuTreeByUserId(Long userId);
+ List<SysMenu> selectMenuTreeByUserId(Long userId);
/**
* 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戜俊鎭�
@@ -58,6 +69,6 @@
* @param menuCheckStrictly 鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�
* @return 閫変腑鑿滃崟鍒楄〃
*/
- public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
+ List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
}
--
Gitblit v1.9.3