admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-08 09:38:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 用户配置 large 字段或者 logicDelete 字段不应被添加在 default_column 中。

Browse Source
This commit is contained in:
Suomm 2023-07-07 22:07:14 +08:00
parent fd06219642
commit 8a89d91911
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Column.java
View File

@ -311,12 +311,13 @@ public class Column {
return importClasses; return importClasses;
} }
public boolean isLarge() { public boolean isDefaultColumn() {
if (columnConfig != null && columnConfig.getLarge() != null) { if (columnConfig == null) {
return columnConfig.getLarge(); return true;
} else {
return false;
} }
boolean isLarge = columnConfig.getLarge() != null && columnConfig.getLarge();
boolean isLogicDelete = columnConfig.getLogicDelete() != null && columnConfig.getLogicDelete();
return !isLarge && !isLogicDelete;
} }
@Override @Override

2
mybatis-flex-codegen/src/main/resources/templates/enjoy/tableDef.tpl
View File

@ -20,7 +20,7 @@ public class #(tableDefClassName) extends TableDef {
#end #end
public final QueryColumn #(tableDefConfig.buildFieldName("allColumns")) = new QueryColumn(this, "*"); public final QueryColumn #(tableDefConfig.buildFieldName("allColumns")) = new QueryColumn(this, "*");
public final QueryColumn[] #(tableDefConfig.buildFieldName("defaultColumns")) = new QueryColumn[]{#for(column: table.columns)#if(!column.isLarge())#(tableDefConfig.buildFieldName(column.property))#if(for.index + 1 != for.size), #end#end#end}; public final QueryColumn[] #(tableDefConfig.buildFieldName("defaultColumns")) = new QueryColumn[]{#for(column: table.columns)#if(column.isDefaultColumn())#(tableDefConfig.buildFieldName(column.property))#if(for.index + 1 != for.size), #end#end#end};
public #(tableDefClassName)() { public #(tableDefClassName)() {
super("#(schema)", "#(table.name)"); super("#(schema)", "#(table.name)");