From 4a00e4c9b1747912b4cf49a07504d8485d076869 Mon Sep 17 00:00:00 2001 From: JackyTang <5206969+jackytang_520@user.noreply.gitee.com> Date: 星期六, 03 九月 2022 14:14:06 +0800 Subject: [PATCH] update 修复镜像标签命名与docker-compose不一致 --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 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..0043903 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,8 @@ 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.mapper.BaseMapperPlus; @@ -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