!127 自动生成代码 Tree型 add/edit 页面生成不正确

Merge pull request !127 from Dulk/fix-genTree

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

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

@@ -325,7 +325,22 @@ 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 boolean isUsableColumn()
+    {
+        return isUsableColumn(javaField);
+    }
+
+    public static boolean isUsableColumn(String javaField)
+    {
+        //isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
+        return StringUtils.equalsAnyIgnoreCase(javaField, "parentId" , "orderNum");
     }
 
     public String readConverterExp()

ruoyi-generator/src/main/resources/vm/html/add.html.vm

@@ -14,7 +14,8 @@
         <form class="form-horizontal m" id="form-${businessName}-add">
 #foreach($column in $columns)
 #set($field=$column.javaField)
-#if($column.insert && !$column.superColumn && !$column.pk)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@@ -101,6 +102,7 @@
             </div>
 #end
 #end
+#end
 #end
         </form>
     </div>

ruoyi-generator/src/main/resources/vm/html/edit.html.vm

@@ -14,7 +14,8 @@
         <form class="form-horizontal m" id="form-${businessName}-edit" th:object="${${className}}">
             <input name="${pkColumn.javaField}" th:field="*{${pkColumn.javaField}}" type="hidden">
 #foreach($column in $columns)
-#if($column.edit && !$column.superColumn && !$column.pk)
+#if($column.edit && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@@ -101,6 +102,7 @@
             </div>
 #end
 #end
+#end
 #end
         </form>
     </div>