From 6adf5d37de9739bde5bb75c51af1846da3ce6ca4 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 30 Nov 2023 17:49:05 +0800
Subject: [PATCH] 房屋标签迁移user_house_label + 圈子表+点赞+文章范围

---
 src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
index 9cc3a94..f6dc98e 100644
--- a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -17,6 +17,8 @@
 package org.springblade.modules.district.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.node.TreeIntegerNode;
+import org.springblade.common.node.TreeStringNode;
 import org.springblade.common.utils.NodeTreeUtil;
 import org.springblade.modules.district.entity.DistrictEntity;
 import org.springblade.modules.district.vo.DistrictVO;
@@ -25,6 +27,8 @@
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
 
 /**
  * 小区表 服务实现类
@@ -47,6 +51,21 @@
 	 */
 	@Override
 	public Object getDistrictTree(DistrictVO district) {
-		return NodeTreeUtil.getStringNodeTree(baseMapper.getDistrictTree(district));
+		List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(baseMapper.getDistrictTree(district));
+		stringNodeTree.forEach(node -> recursion(node));
+		return stringNodeTree;
+	}
+
+
+	/**
+	 * 去除空的数据组
+	 * @param node
+	 */
+	private void recursion(TreeStringNode node) {
+		if (node.getChildren() != null && node.getChildren().size() > 0) {
+			node.getChildren().forEach(node2 -> recursion(node2));
+		} else {
+			node.setChildren(null);
+		}
 	}
 }

--
Gitblit v1.9.3