From 7d1c53f92738166c1ced1a796e2bc95d26d35fa0 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 18 一月 2023 11:59:32 +0800 Subject: [PATCH] update 优化 修改 oss 配置页面开关说明 避免造成误解 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index a573fda..bc1b430 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -8,9 +8,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.system.domain.SysMenu; +import com.ruoyi.system.domain.SysRole; import com.ruoyi.common.helper.LoginHelper; +import com.ruoyi.common.utils.StreamUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.TreeBuildUtils; import com.ruoyi.system.domain.SysRoleMenu; @@ -425,13 +426,7 @@ * 寰楀埌瀛愯妭鐐瑰垪琛� */ private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) { - List<SysMenu> tlist = new ArrayList<SysMenu>(); - for (SysMenu n : list) { - if (n.getParentId().longValue() == t.getMenuId().longValue()) { - tlist.add(n); - } - } - return tlist; + return StreamUtils.filter(list, n -> n.getParentId().equals(t.getMenuId())); } /** @@ -443,11 +438,9 @@ /** * 鍐呴摼鍩熷悕鐗规畩瀛楃鏇挎崲 - * - * @return */ public String innerLinkReplaceEach(String path) { - return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, "." }, - new String[]{"", ""}); + return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, "."}, + new String[]{"", "", "", "/"}); } } -- Gitblit v1.9.3