diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java index d33cb3f4b..4228763f9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java @@ -41,9 +41,6 @@ public class MenuAuthTreeVO { @ApiModelProperty("菜单类型 1菜单 2权限") private Integer menuType; - @ApiModelProperty("权限列表") - private List authorityList; - @ApiModelProperty("子菜单") private List children; @@ -82,23 +79,15 @@ public class MenuAuthTreeVO { } public static void getChild(MenuAuthTreeVO data, Map> parentGroup) { - List sysMenuDOList = parentGroup.get(data.getId()); - List parentMenuList = ListUtils.emptyIfNull(sysMenuDOList).stream().filter(menu -> MenuTypeEnum.MENU.getCode().equals(menu.getMenuType())).collect(Collectors.toList()); - List parentAuthList = ListUtils.emptyIfNull(sysMenuDOList).stream().filter(menu -> MenuTypeEnum.AUTH.getCode().equals(menu.getMenuType())).collect(Collectors.toList()); + List menuList = parentGroup.get(data.getId()); //属于菜单下时候 - if (CollectionUtils.isNotEmpty(parentMenuList)) { - List voList = convertVO(parentMenuList); - List menuList = voList.stream().filter(vo -> MenuTypeEnum.MENU.getCode().equals(vo.getMenuType())).collect(Collectors.toList()); - data.setChildren(menuList); + if (CollectionUtils.isNotEmpty(menuList)) { + List voList = convertVO(menuList); + data.setChildren(voList); voList.forEach(child -> { getChild(child, parentGroup); }); } - //数据是权限的的时候 - if (CollectionUtils.isNotEmpty(parentAuthList)) { - List authorityList = convertVO(parentAuthList); - data.setAuthorityList(authorityList); - } } }