diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java index 165bf7ac..ca5c4762 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java @@ -211,9 +211,11 @@ public class GroupManagementServiceImpl implements GroupManagementService { */ public List buildGroupTree(List taxplayercodeDeptList) { //查找出level最小的节点 -// TaxPlayerCodeDept taxPlayerCodeDeptMinLevel = taxplayercodeDeptList.stream().min(Comparator.comparing(TaxPlayerCodeDept::getLevel)).get(); -// String parentId = StringUtils.isBlank(taxPlayerCodeDeptMinLevel.getParentId()) ? "0" : taxPlayerCodeDeptMinLevel.getParentId(); - List parentIdList = taxplayercodeDeptList.stream().map(DeptEntity::getParentId).collect(Collectors.toList()); + //TaxPlayerCodeDept taxPlayerCodeDeptMinLevel = taxplayercodeDeptList.stream().min(Comparator.comparing(TaxPlayerCodeDept::getLevel)).get(); + //String parentId = StringUtils.isBlank(taxPlayerCodeDeptMinLevel.getParentId()) ? "0" : taxPlayerCodeDeptMinLevel.getParentId(); + List parentIdList = taxplayercodeDeptList.stream().map(DeptEntity::getParentId).distinct().collect(Collectors.toList()); + List collect = taxplayercodeDeptList.stream().map(DeptEntity::getDeptId).distinct().collect(Collectors.toList()); + parentIdList = parentIdList.stream().filter(t->!collect.contains(t)).collect(Collectors.toList()); List> nodeList = CollUtil.newArrayList(); taxplayercodeDeptList.forEach(taxPlayerCodeDept -> { TreeNode treeNode;