浏览代码

fix:修订代码自动生成中Tree型的Domain属性重复

GenTableColumn.java
public static boolean isSuperColumn(String javaField)
基类有两种,BaseEntity 和 TreeEntity,其中父类忽略的属性中只包含了 BaseEntity 的属性,而没有包含 TreeEntity 中的属性
如此生成的Tree型Domain中,父类已有属性会重复生成
另,为 TreeEntity 添加了 祖级列表属性 ancestors
deng-cc 5 年之前
父节点
当前提交
ac5f45d11a

+ 13 - 0
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;
+    }
 }

+ 5 - 1
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()