From 9bc2d2981b540aa291cfecde5d33615df56a078b Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 22 七月 2022 09:59:19 +0800 Subject: [PATCH] update springboot 2.7.1 => 2.7.2 update hutool 5.8.3 => 5.8.4 update okhttp 4.9.1 => 4.10.0 update lock4j 2.2.1 => 2.2.2 update aws-java-sdk-s3 1.12.248 => 1.12.264 修复依赖安全漏洞 update aliyun.sms 2.0.9 => 2.0.16 update tencent.sms 3.1.537 => 3.1.555 update guava 30.0-jre => 31.1-jre --- ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java index eea882e..e7b5c9b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -1,7 +1,6 @@ package com.ruoyi.system.service; -import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.TreeSelect; +import cn.hutool.core.lang.tree.Tree; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.system.domain.vo.RouterVo; @@ -13,7 +12,7 @@ * * @author Lion Li */ -public interface ISysMenuService extends IService<SysMenu> { +public interface ISysMenuService { /** * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃 @@ -54,7 +53,7 @@ * @param roleId 瑙掕壊ID * @return 閫変腑鑿滃崟鍒楄〃 */ - List<Integer> selectMenuListByRoleId(Long roleId); + List<Long> selectMenuListByRoleId(Long roleId); /** * 鏋勫缓鍓嶇璺敱鎵�闇�瑕佺殑鑿滃崟 @@ -65,20 +64,12 @@ List<RouterVo> buildMenus(List<SysMenu> menus); /** - * 鏋勫缓鍓嶇鎵�闇�瑕佹爲缁撴瀯 - * - * @param menus 鑿滃崟鍒楄〃 - * @return 鏍戠粨鏋勫垪琛� - */ - List<SysMenu> buildMenuTree(List<SysMenu> menus); - - /** * 鏋勫缓鍓嶇鎵�闇�瑕佷笅鎷夋爲缁撴瀯 * * @param menus 鑿滃崟鍒楄〃 * @return 涓嬫媺鏍戠粨鏋勫垪琛� */ - List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus); + List<Tree<Long>> buildMenuTreeSelect(List<SysMenu> menus); /** * 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅 -- Gitblit v1.9.3