|
|
@@ -158,7 +158,7 @@ public class SysMenuServiceImpl implements ISysMenuService
|
|
158
|
158
|
router.setRedirect("noRedirect");
|
|
159
|
159
|
router.setChildren(buildMenus(cMenus));
|
|
160
|
160
|
}
|
|
161
|
|
- else if (isMeunFrame(menu))
|
|
|
161
|
+ else if (isMenuFrame(menu))
|
|
162
|
162
|
{
|
|
163
|
163
|
List<RouterVo> childrenList = new ArrayList<RouterVo>();
|
|
164
|
164
|
RouterVo children = new RouterVo();
|
|
|
@@ -321,7 +321,7 @@ public class SysMenuServiceImpl implements ISysMenuService
|
|
321
|
321
|
{
|
|
322
|
322
|
String routerName = StringUtils.capitalize(menu.getPath());
|
|
323
|
323
|
// 非外链并且是一级目录(类型为目录)
|
|
324
|
|
- if (isMeunFrame(menu))
|
|
|
324
|
+ if (isMenuFrame(menu))
|
|
325
|
325
|
{
|
|
326
|
326
|
routerName = StringUtils.EMPTY;
|
|
327
|
327
|
}
|
|
|
@@ -344,7 +344,7 @@ public class SysMenuServiceImpl implements ISysMenuService
|
|
344
|
344
|
routerPath = "/" + menu.getPath();
|
|
345
|
345
|
}
|
|
346
|
346
|
// 非外链并且是一级目录(类型为菜单)
|
|
347
|
|
- else if (isMeunFrame(menu))
|
|
|
347
|
+ else if (isMenuFrame(menu))
|
|
348
|
348
|
{
|
|
349
|
349
|
routerPath = "/";
|
|
350
|
350
|
}
|
|
|
@@ -360,7 +360,7 @@ public class SysMenuServiceImpl implements ISysMenuService
|
|
360
|
360
|
public String getComponent(SysMenu menu)
|
|
361
|
361
|
{
|
|
362
|
362
|
String component = UserConstants.LAYOUT;
|
|
363
|
|
- if (StringUtils.isNotEmpty(menu.getComponent()) && !isMeunFrame(menu))
|
|
|
363
|
+ if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu))
|
|
364
|
364
|
{
|
|
365
|
365
|
component = menu.getComponent();
|
|
366
|
366
|
}
|
|
|
@@ -377,7 +377,7 @@ public class SysMenuServiceImpl implements ISysMenuService
|
|
377
|
377
|
* @param menu 菜单信息
|
|
378
|
378
|
* @return 结果
|
|
379
|
379
|
*/
|
|
380
|
|
- public boolean isMeunFrame(SysMenu menu)
|
|
|
380
|
+ public boolean isMenuFrame(SysMenu menu)
|
|
381
|
381
|
{
|
|
382
|
382
|
return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
|
|
383
|
383
|
&& menu.getIsFrame().equals(UserConstants.NO_FRAME);
|