From 3d292952741fd72d6bbb8ed4218fb18a3683839e Mon Sep 17 00:00:00 2001
From: deng-cc <360075602@qq.com>
Date: Thu, 5 Sep 2019 17:01:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=A0=91=E5=BD=A2?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E5=88=86=E5=BF=85=E8=A6=81=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/generator/domain/GenTableColumn.java    | 11 +++++++++++
 .../src/main/resources/vm/html/add.html.vm            |  4 +++-
 .../src/main/resources/vm/html/edit.html.vm           |  4 +++-
 3 files changed, 17 insertions(+), 2 deletions(-)

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 56fef67a..b17c3831 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
@@ -332,6 +332,17 @@ public class GenTableColumn extends BaseEntity
                 "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()
     {
         String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
diff --git a/ruoyi-generator/src/main/resources/vm/html/add.html.vm b/ruoyi-generator/src/main/resources/vm/html/add.html.vm
index 8495268e..c10db0cb 100644
--- a/ruoyi-generator/src/main/resources/vm/html/add.html.vm
+++ b/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>
diff --git a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm
index 687d9d10..2b82f98e 100644
--- a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm
+++ b/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>