|
|
@@ -175,7 +175,7 @@ public class SysMenuServiceImpl implements ISysMenuService
|
|
175
|
175
|
router.setQuery(menu.getQuery());
|
|
176
|
176
|
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
|
|
177
|
177
|
List<SysMenu> cMenus = menu.getChildren();
|
|
178
|
|
- if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
|
|
|
178
|
+ if (StringUtils.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
|
|
179
|
179
|
{
|
|
180
|
180
|
router.setAlwaysShow(true);
|
|
181
|
181
|
router.setRedirect("noRedirect");
|
|
|
@@ -475,8 +475,8 @@ public class SysMenuServiceImpl implements ISysMenuService
|
|
475
|
475
|
/**
|
|
476
|
476
|
* 递归列表
|
|
477
|
477
|
*
|
|
478
|
|
- * @param list
|
|
479
|
|
- * @param t
|
|
|
478
|
+ * @param list 分类表
|
|
|
479
|
+ * @param t 子节点
|
|
480
|
480
|
*/
|
|
481
|
481
|
private void recursionFn(List<SysMenu> list, SysMenu t)
|
|
482
|
482
|
{
|
|
|
@@ -521,11 +521,11 @@ public class SysMenuServiceImpl implements ISysMenuService
|
|
521
|
521
|
/**
|
|
522
|
522
|
* 内链域名特殊字符替换
|
|
523
|
523
|
*
|
|
524
|
|
- * @return
|
|
|
524
|
+ * @return 替换后的内链域名
|
|
525
|
525
|
*/
|
|
526
|
526
|
public String innerLinkReplaceEach(String path)
|
|
527
|
527
|
{
|
|
528
|
|
- return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS, Constants.WWW, "." },
|
|
529
|
|
- new String[] { "", "", "", "/" });
|
|
|
528
|
+ return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":" },
|
|
|
529
|
+ new String[] { "", "", "", "/", "/" });
|
|
530
|
530
|
}
|
|
531
|
531
|
}
|