From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 24 十二月 2021 11:36:02 +0800 Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework --- ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java | 14 +++----------- 1 files changed, 3 insertions(+), 11 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..9424052 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,7 @@ package com.ruoyi.system.service; +import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.system.domain.vo.RouterVo; @@ -54,7 +54,7 @@ * @param roleId 瑙掕壊ID * @return 閫変腑鑿滃崟鍒楄〃 */ - List<Integer> selectMenuListByRoleId(Long roleId); + List<Long> selectMenuListByRoleId(Long roleId); /** * 鏋勫缓鍓嶇璺敱鎵�闇�瑕佺殑鑿滃崟 @@ -65,20 +65,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