From bff9012bda73b453defe7108133f927dbeba7849 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 20 Jul 2022 10:44:11 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20=E5=A4=84=E7=90=86=E6=87=92=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cloud/kicc/common/data/entity/TreeEntity.java  |  4 ++--
 .../com/cloud/kicc/system/mapper/RegionMapper.java     | 10 ++++++----
 .../kicc/system/service/impl/RegionServiceImpl.java    |  5 ++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/TreeEntity.java b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/TreeEntity.java
index eba7f88f..d2082010 100644
--- a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/TreeEntity.java
+++ b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/TreeEntity.java
@@ -38,7 +38,7 @@ public class TreeEntity<T> extends CommonEntity {
 
     @ApiModelProperty("子级集合")
     @TableField(exist = false)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    protected List<T> children = new ArrayList();
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    protected List<T> children;
 
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RegionMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RegionMapper.java
index 492440c5..6afdf76a 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RegionMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RegionMapper.java
@@ -6,10 +6,12 @@ import com.cloud.kicc.system.api.entity.Region;
 import java.util.List;
 
 /**
- * @Author: TangSheng
- * @Description:
- * @Since 1.0
- * @Date Created in 11:07 2022/3/21
+ *<p>
+ * 区域 Mapper 接口
+ *</p>
+ *
+ * @Author: entfrm开发团队-王翔
+ * @Date: 2022/7/20
  */
 public interface RegionMapper extends BaseMapper<Region> {
 
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RegionServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RegionServiceImpl.java
index 4e0c17d3..6ec3abce 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RegionServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RegionServiceImpl.java
@@ -1,6 +1,8 @@
 package com.cloud.kicc.system.service.impl;
 
 
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.system.api.entity.Region;
 import com.cloud.kicc.system.mapper.RegionMapper;
@@ -8,6 +10,7 @@ import com.cloud.kicc.system.service.RegionService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -32,7 +35,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
                     List<Region> regionChildren = regionList.stream()
                             .filter(e -> e.getParentId().equals(item.getId())).collect(Collectors.toList());
                     if(regionChildren.size() != 0) {
-                        item.setChildren(regionChildren);
+                        item.setChildren(ListUtil.empty());
                     }
                     return item;
                 }).collect(Collectors.toList());