From 14f65b67613dd78cf6932bc77954a2239375e03c Mon Sep 17 00:00:00 2001 From: programgsq Date: Wed, 20 Jul 2022 07:25:42 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E8=8F=9C=E5=8D=95bug=20isFrame=E4=B8=BAInteger?= =?UTF-8?q?=EF=BC=8CNO=5FFRAME=E4=B8=BAString=EF=BC=8C=E5=BD=93equils?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=B0=B8=E8=BF=9C=E4=B8=BAfalse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index e63024c9..8380c30f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -154,7 +154,7 @@ public class SysMenuServiceImpl implements ISysMenuService router.setQuery(menu.getQuery()); router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); List cMenus = menu.getChildren(); - if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) + if (!cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) { router.setAlwaysShow(true); router.setRedirect("noRedirect"); @@ -362,7 +362,7 @@ public class SysMenuServiceImpl implements ISysMenuService } // 非外链并且是一级目录（类型为目录） if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) - && UserConstants.NO_FRAME.equals(menu.getIsFrame())) + && UserConstants.NO_FRAME.equals(menu.getIsFrame().toString())) { routerPath = "/" + menu.getPath(); } @@ -407,7 +407,7 @@ public class SysMenuServiceImpl implements ISysMenuService public boolean isMenuFrame(SysMenu menu) { return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType()) - && menu.getIsFrame().equals(UserConstants.NO_FRAME); + && menu.getIsFrame().toString().equals(UserConstants.NO_FRAME); } /** @@ -418,7 +418,7 @@ public class SysMenuServiceImpl implements ISysMenuService */ public boolean isInnerLink(SysMenu menu) { - return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath()); + return menu.getIsFrame().toString().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath()); } /**