|
@@ -223,11 +223,7 @@ public class SysMenuServiceImpl implements ISysMenuService |
|
@@ -223,11 +223,7 @@ public class SysMenuServiceImpl implements ISysMenuService |
|
223
|
public List<SysMenu> buildMenuTree(List<SysMenu> menus)
|
223
|
public List<SysMenu> buildMenuTree(List<SysMenu> menus)
|
|
224
|
{
|
224
|
{
|
|
225
|
List<SysMenu> returnList = new ArrayList<SysMenu>();
|
225
|
List<SysMenu> returnList = new ArrayList<SysMenu>();
|
|
226
|
- List<Long> tempList = new ArrayList<Long>();
|
|
|
|
227
|
- for (SysMenu dept : menus)
|
|
|
|
228
|
- {
|
|
|
|
229
|
- tempList.add(dept.getMenuId());
|
|
|
|
230
|
- }
|
226
|
+ List<Long> tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
|
|
231
|
for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
|
227
|
for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
|
|
232
|
{
|
228
|
{
|
|
233
|
SysMenu menu = (SysMenu) iterator.next();
|
229
|
SysMenu menu = (SysMenu) iterator.next();
|
|
@@ -479,8 +475,8 @@ public class SysMenuServiceImpl implements ISysMenuService |
|
@@ -479,8 +475,8 @@ public class SysMenuServiceImpl implements ISysMenuService |
|
479
|
/**
|
475
|
/**
|
|
480
|
* 递归列表
|
476
|
* 递归列表
|
|
481
|
*
|
477
|
*
|
|
482
|
- * @param list
|
|
|
|
483
|
- * @param t
|
478
|
+ * @param list 分类表
|
|
|
|
479
|
+ * @param t 子节点
|
|
484
|
*/
|
480
|
*/
|
|
485
|
private void recursionFn(List<SysMenu> list, SysMenu t)
|
481
|
private void recursionFn(List<SysMenu> list, SysMenu t)
|
|
486
|
{
|
482
|
{
|
|
@@ -525,7 +521,7 @@ public class SysMenuServiceImpl implements ISysMenuService |
|
@@ -525,7 +521,7 @@ public class SysMenuServiceImpl implements ISysMenuService |
|
525
|
/**
|
521
|
/**
|
|
526
|
* 内链域名特殊字符替换
|
522
|
* 内链域名特殊字符替换
|
|
527
|
*
|
523
|
*
|
|
528
|
- * @return
|
524
|
+ * @return 替换后的内链域名
|
|
529
|
*/
|
525
|
*/
|
|
530
|
public String innerLinkReplaceEach(String path)
|
526
|
public String innerLinkReplaceEach(String path)
|
|
531
|
{
|
527
|
{
|