From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;

---
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 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 44cd7ac..366115a 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,9 +1,11 @@
 package com.ruoyi.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -25,10 +27,10 @@
     /**
      * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
      *
-     * @param menu 鑿滃崟淇℃伅
+     * @param queryWrapper 鏌ヨ鏉′欢
      * @return 鑿滃崟鍒楄〃
      */
-    List<SysMenu> selectMenuListByUserId(SysMenu menu);
+    List<SysMenu> selectMenuListByUserId(@Param(Constants.WRAPPER) Wrapper<SysMenu> queryWrapper);
 
     /**
      * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
@@ -39,6 +41,14 @@
     List<String> selectMenuPermsByUserId(Long userId);
 
     /**
+     * 鏍规嵁瑙掕壊ID鏌ヨ鏉冮檺
+     *
+     * @param roleId 瑙掕壊ID
+     * @return 鏉冮檺鍒楄〃
+     */
+    List<String> selectMenuPermsByRoleId(Long roleId);
+
+    /**
      * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
      *
      * @return 鑿滃崟鍒楄〃

--
Gitblit v1.9.3