From 14b6dc5b95dc2c0bcb58022daf008da11c8b7b77 Mon Sep 17 00:00:00 2001
From: deng-cc <360075602@qq.com>
Date: Wed, 4 Sep 2019 16:49:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E8=AE=A2=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=B8=ADTree=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84Domain=E5=B1=9E=E6=80=A7=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GenTableColumn.java
public static boolean isSuperColumn(String javaField)
基类有两种，BaseEntity 和 TreeEntity，其中父类忽略的属性中只包含了 BaseEntity 的属性，而没有包含 TreeEntity 中的属性
如此生成的Tree型Domain中，父类已有属性会重复生成
另，为 TreeEntity 添加了 祖级列表属性 ancestors
---
 .../com/ruoyi/common/core/domain/TreeEntity.java    | 13 +++++++++++++
 .../com/ruoyi/generator/domain/GenTableColumn.java  |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
index d580f027..7a0efe62 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@@ -18,6 +18,9 @@ public class TreeEntity extends BaseEntity
     /** 显示顺序 */
     private Integer orderNum;
 
+    /** 祖级列表 */
+    private String ancestors;
+
     public String getParentName()
     {
         return parentName;
@@ -47,4 +50,14 @@ public class TreeEntity extends BaseEntity
     {
         this.orderNum = orderNum;
     }
+
+    public String getAncestors()
+    {
+        return ancestors;
+    }
+
+    public void setAncestors(String ancestors)
+    {
+        this.ancestors = ancestors;
+    }
 }
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index bb912ed4..56fef67a 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -325,7 +325,11 @@ public class GenTableColumn extends BaseEntity
 
     public static boolean isSuperColumn(String javaField)
     {
-        return StringUtils.equalsAnyIgnoreCase(javaField, "createBy", "createTime", "updateBy", "updateTime", "remark");
+        return StringUtils.equalsAnyIgnoreCase(javaField,
+                //BaseEntity
+                "createBy", "createTime", "updateBy", "updateTime", "remark",
+                //TreeEntity
+                "parentName", "parentId", "orderNum", "ancestors");
     }
 
     public String readConverterExp()