|
|
|
@ -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<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.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());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|