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')){ %>