Browse Source

修改查询树

gaohp 10 months ago
parent
commit
49cccbc242

+ 7 - 5
feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathServiceImpl.java

@@ -170,11 +170,13 @@ public class SharePathServiceImpl implements SharePathService {
         List<TreeNode> deep = sharePathDO2TreeNode(sharePathDOS);
         if (maxDepth > 1) {
             List<Long> descs = sharePathDOS.stream().filter(k -> k.getDepth() > 1).map(SharePathDO::getDescendant).collect(Collectors.toList());
-            // 获取大于1层级的数据
-            List<SharePathDO> descList = sharePathMapper.selectList(new LambdaQueryWrapperX<SharePathDO>().ne(SharePathDO::getAncestor, 1).in(SharePathDO::getDescendant, descs));
-            List<TreeNode> treeNodes1 = sharePathDO2TreeNode(descList);
-            deep = deep.stream().filter(k -> k.getDeep() == 1).collect(Collectors.toList());
-            deep.addAll(treeNodes1);
+            if (descs.size()>0){
+                // 获取大于1层级的数据
+                List<SharePathDO> descList = sharePathMapper.selectList(new LambdaQueryWrapperX<SharePathDO>().ne(SharePathDO::getAncestor, 1).in(SharePathDO::getDescendant, descs));
+                List<TreeNode> treeNodes1 = sharePathDO2TreeNode(descList);
+                deep = deep.stream().filter(k -> k.getDeep() == 1).collect(Collectors.toList());
+                deep.addAll(treeNodes1);
+            }
         }
         // 整合结构
         List<TreeNode> treeNodes = listWithTree(deep, userId);