From 2cff2094c8fb0c60b8498c60a7f14aa82d29e86f Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 2 May 2022 02:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A3=20=E5=88=B6=E5=AE=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=A7=84=E8=8C=83=E6=A8=A1=E6=9D=BF=E5=9B=A2=E9=98=9F?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cloud/kicc/system/api/entity/Dept.java   |  4 +++-
 .../cloud/kicc/system/mapper/RoleDeptMapper.java | 16 ----------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleDeptMapper.java

diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Dept.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Dept.java
index 8eba5903..98efcb93 100644
--- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Dept.java
+++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Dept.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cloud.kicc.common.data.entity.CommonEntity;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -82,5 +83,6 @@ public class Dept extends CommonEntity {
      * 子菜单
      */
     @TableField(exist = false)
-    private List<Dept> children = new ArrayList<Dept>();
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<Dept> children = new ArrayList();
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleDeptMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleDeptMapper.java
deleted file mode 100644
index a808a0c5..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleDeptMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cloud.kicc.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cloud.kicc.system.api.entity.RoleDept;
-
-/**
- *<p>
- * 角色和部门关联表 Mapper 接口
- *</p>
- *
- * @Author: entfrm开发团队-王翔
- * @Date: 2022/2/24
- */
-public interface RoleDeptMapper extends BaseMapper<RoleDept> {
-
-}