From 1e13e02c47ea71ebb5aa58b0540853d329d06e70 Mon Sep 17 00:00:00 2001 From: gaorl Date: Sun, 7 May 2023 11:34:07 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=BC=80=E7=A5=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=91=E9=87=8D=E5=A4=8D=E9=A1=B9bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GroupManagementServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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;