fix: 零部件书搜索
This commit is contained in:
+2
-1
@@ -123,7 +123,8 @@ public class DictTreeService {
|
|||||||
Set<String> rootNodeIds = rootNodes.stream().map(SysDictItem::getId).collect(Collectors.toSet());
|
Set<String> rootNodeIds = rootNodes.stream().map(SysDictItem::getId).collect(Collectors.toSet());
|
||||||
rootNodes.forEach(node -> {
|
rootNodes.forEach(node -> {
|
||||||
node.setLeafFlag(matchedNodes.stream()
|
node.setLeafFlag(matchedNodes.stream()
|
||||||
.noneMatch(n -> rootNodeIds.contains(n.getParentId())));
|
.noneMatch(n -> (rootNodeIds.contains(n.getParentId()) &&
|
||||||
|
n.getParentId().equals(node.getId()))));
|
||||||
});
|
});
|
||||||
|
|
||||||
return new ArrayList<>(rootNodes);
|
return new ArrayList<>(rootNodes);
|
||||||
|
|||||||
+2
-1
@@ -288,7 +288,8 @@ public class PartNameServiceImpl extends ServiceImpl<PartNameMapper, PartName>
|
|||||||
Set<String> rootNodeCodes = rootNodes.stream().map(PartName::getCode).collect(Collectors.toSet());
|
Set<String> rootNodeCodes = rootNodes.stream().map(PartName::getCode).collect(Collectors.toSet());
|
||||||
rootNodes.forEach(node -> {
|
rootNodes.forEach(node -> {
|
||||||
node.setLeafFlag(matchedNodes.stream()
|
node.setLeafFlag(matchedNodes.stream()
|
||||||
.noneMatch(n -> rootNodeCodes.contains(n.getParentCode())));
|
.noneMatch(n -> (rootNodeCodes.contains(n.getParentCode()) &&
|
||||||
|
n.getParentCode().equals(node.getCode()))));
|
||||||
});
|
});
|
||||||
|
|
||||||
return new ArrayList<>(rootNodes);
|
return new ArrayList<>(rootNodes);
|
||||||
|
|||||||
Reference in New Issue
Block a user