修改查询树, 增加判断是否有儿子

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/sharepath/vo/TreeNode.java

@@ -19,5 +19,10 @@ public class TreeNode {
     private Integer deep;
     private Integer value; // 节点值，某些节点可能没有值
     private Long parentId; // 父亲Id
+    private Boolean hasSon;
     private List<TreeNode> children; // 子节点列表
+
+    public Boolean getHasSon() {
+        return !children.isEmpty();
+    }
 }

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

@@ -170,13 +170,14 @@ 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());
-            if (descs.size()>0){
-                // 获取大于1层级的数据
+            // 获取大于1层级的数据
+            if (!descs.isEmpty()){
                 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);