修复构建路由菜单bug

isFrame为Integer,NO_FRAME为String,当equils时,永远为false
pull/219/head
programgsq 3 years ago committed by Gitee
parent 9ebd484f46
commit 14f65b6761
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

@ -154,7 +154,7 @@ public class SysMenuServiceImpl implements ISysMenuService
router.setQuery(menu.getQuery()); router.setQuery(menu.getQuery());
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
List<SysMenu> cMenus = menu.getChildren(); List<SysMenu> 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.setAlwaysShow(true);
router.setRedirect("noRedirect"); router.setRedirect("noRedirect");
@ -362,7 +362,7 @@ public class SysMenuServiceImpl implements ISysMenuService
} }
// 非外链并且是一级目录(类型为目录) // 非外链并且是一级目录(类型为目录)
if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) 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(); routerPath = "/" + menu.getPath();
} }
@ -407,7 +407,7 @@ public class SysMenuServiceImpl implements ISysMenuService
public boolean isMenuFrame(SysMenu menu) public boolean isMenuFrame(SysMenu menu)
{ {
return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType()) 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) 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());
} }
/** /**

Loading…
Cancel
Save