From fe2df80654a87f341a2af2580ac737e2c359c8af Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 20 Aug 2019 14:44:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20gen.forceLowerCase=20=E8=A1=A8=E5=90=8D=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E6=98=AF=E5=90=A6=E5=BC=BA=E5=88=B6=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml     | 3 +++
 .../main/resources/templates/modules/gen/crud/entity.xml    | 4 ++--
 .../templates/modules/gen/include/formControl.html          | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 08b1f856..7e80bd03 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -279,6 +279,9 @@ job:
 # 代码生成
 gen:
   enabled: true
+  
+  # 表名字段名是否强制小写
+  forceLowerCase: true
 
 # 系统监控
 state:
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
index ba1476f9..129b60e7 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
@@ -173,7 +173,7 @@ public class ${ClassName} extends ${table.isTreeEntity?'Tree':'Data'}Entity<${Cl
 			}
 		}
 		// 如果不是基类属性
-		else if(c.columnName != 'id' && !c.isSuperColumn){
+		else if(!@StringUtils.equalsIgnoreCase(c.columnName, 'id') && !c.isSuperColumn){
 			// 父类对象
 			if(table.parentExists && table.parentTableFkName == c.columnName){
 	%>
@@ -268,7 +268,7 @@ public class ${ClassName} extends ${table.isTreeEntity?'Tree':'Data'}Entity<${Cl
 	<%
 				}
 		// 如果不是基类属性
-		}else if(c.columnName != 'id' && !c.isSuperColumn){
+		}else if(!@StringUtils.equalsIgnoreCase(c.columnName, 'id') && !c.isSuperColumn){
 	%>
 	
 	<%
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/formControl.html b/modules/core/src/main/resources/templates/modules/gen/include/formControl.html
index 6afbe842..9562b037 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/formControl.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/formControl.html
@@ -3,7 +3,7 @@
 	for (c in table.columnList){
 		if (c.isEdit == '1'){
 			// 如果是树结构的字段，则自动忽略
-			if(table.isTreeEntity && @StringUtils.inString(c.columnName, 'parent_code',
+			if(table.isTreeEntity && @StringUtils.inStringIgnoreCase(c.columnName, 'parent_code',
 				'parent_codes', 'tree_sorts', 'tree_leaf', 'tree_level', 'tree_names')){
 			}
 			// 如果是隐藏域
@@ -41,7 +41,7 @@
 					isNewLine = true;
 				}
 				// 如果是扩展字段，则输出子标题，并且强制换行
-				if (c.columnName == 'extend_s1'){
+				if (@StringUtils.equalsIgnoreCase(c.columnName, 'extend_s1')){
 					isNewLine = true;
 				}
 				// 如果是第一个控件
@@ -57,7 +57,7 @@
 <%
 				}
 				// 如果是扩展字段，则输出子标题，并且强制换行
-				if (c.columnName == 'extend_s1'){
+				if (@StringUtils.equalsIgnoreCase(c.columnName, 'extend_s1')){
 %>
 				<div class="form-unit">\${text('扩展字段')}</div>
 <%