wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:[REQ-3282] 解决代码冲突问题

Browse Source
This commit is contained in:
liuyang 2024-12-24 15:17:07 +08:00
parent f69c8b41b0
commit 3037260d9c
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java
View File

@ -166,16 +166,16 @@ public class NodeServiceImpl implements NodeService {
List<NodeQueryRepository.NodeResp> descendantsNodes = nodeQueryRepository.list(
NodeQueryRepository.ListReq.builder()
.pathsRight(paths).build());
page.getData().addAll(descendantsNodes);
assembleDescendantNodes(records, descendantsNodes);
}
// 是否查询子节点
if (BooleanUtil.isTrue(req.getIncludeChildren())) {
Set<Long> ids = nodeFoundationService.extract(page.getData(), NodeQueryRepository.NodeResp::getId);
List<NodeQueryRepository.NodeResp> descendantShipNodes = nodeQueryRepository.list(
List<NodeQueryRepository.NodeResp> childrenNodes = nodeQueryRepository.list(
NodeQueryRepository.ListReq.builder()
.parentIds(ids).build());
assembleChildrenNodes(records, descendantShipNodes);
assembleChildrenNodes(records, childrenNodes);
}
return new PageResp<>(page.getTotal(), page.getSize(), page.getCurrent(), records);
@ -249,23 +249,16 @@ public class NodeServiceImpl implements NodeService {
* @param nodes
* @param descendantNodes
*/
// public void assembleDescendantNodes(List<OrgNodeDTO> nodes, List<NodeQueryRepository.NodeResp> descendantNodes) {
// if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(descendantNodes)) {
// return;
// }
// Map<Long, NodeQueryRepository.NodeResp> childrenNodeMap = descendantNodes.stream()
// .filter(t -> t.getParentId() != null && t.getParentId() != 0)
// .collect(Collectors.toMap(NodeQueryRepository.NodeResp::getParentId, Function.identity()));
// nodes.forEach(e -> {
// NodeQueryRepository.NodeResp nodeResp = childrenNodeMap.get(e.getId());
// e.setDescendantNodes(Arrays.stream(parentIds)
// .map(Long::valueOf)
// .map(parentNodeMap::get)
// .map(t -> BeanUtil.copyProperties(t, OrgNodeDTO.class))
// .filter(Objects::nonNull)
// .collect(Collectors.toList()));
// });
// }
public void assembleDescendantNodes(List<OrgNodeDTO> nodes, List<NodeQueryRepository.NodeResp> descendantNodes) {
if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(descendantNodes)) {
return;
}
nodes.forEach(e -> {
e.setDescendantNodes(descendantNodes.stream()
.filter(t -> t.getPath().startsWith(e.getPath()))
.map(t -> BeanUtil.copyProperties(t, OrgNodeDTO.class))
.filter(Objects::nonNull)
.collect(Collectors.toList()));
});
}
}