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:18:46 +08:00
parent cd903c7b25
commit 5f69d297c2
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/dto/OrgNodeDTO.java
View File

@ -111,11 +111,6 @@ public class OrgNodeDTO implements Serializable {
*/
private List<OrgNodeDTO> ancestorNodes;
/**
* 子节点
*/
private List<OrgNodeDTO> childrenNode;
/**
* 子孙节点
*/

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

@ -175,7 +175,6 @@ public class NodeServiceImpl implements NodeService {
List<NodeQueryRepository.NodeResp> childrenNodes = nodeQueryRepository.list(
NodeQueryRepository.ListReq.builder()
.parentIds(ids).build());
assembleChildrenNodes(records, childrenNodes);
}
return new PageResp<>(page.getTotal(), page.getSize(), page.getCurrent(), records);
@ -224,25 +223,6 @@ public class NodeServiceImpl implements NodeService {
});
}
/**
* 聚合祖父节点
*
* @param nodes
* @param childrenNodes
*/
public void assembleChildrenNodes(List<OrgNodeDTO> nodes, List<NodeQueryRepository.NodeResp> childrenNodes) {
if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(childrenNodes)) {
return;
}
Map<Long, NodeQueryRepository.NodeResp> childrenNodeMap = childrenNodes.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.setParentNode(BeanUtil.copyProperties(nodeResp, OrgNodeDTO.class));
});
}
/**
* 聚合祖父节点
*