diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Column.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Column.java index 7e1c603d..1fc07bb0 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Column.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Column.java @@ -311,12 +311,13 @@ public class Column { return importClasses; } - public boolean isLarge() { - if (columnConfig != null && columnConfig.getLarge() != null) { - return columnConfig.getLarge(); - } else { - return false; + public boolean isDefaultColumn() { + if (columnConfig == null) { + return true; } + boolean isLarge = columnConfig.getLarge() != null && columnConfig.getLarge(); + boolean isLogicDelete = columnConfig.getLogicDelete() != null && columnConfig.getLogicDelete(); + return !isLarge && !isLogicDelete; } @Override diff --git a/mybatis-flex-codegen/src/main/resources/templates/enjoy/tableDef.tpl b/mybatis-flex-codegen/src/main/resources/templates/enjoy/tableDef.tpl index c2089fa7..7bf6f3b1 100644 --- a/mybatis-flex-codegen/src/main/resources/templates/enjoy/tableDef.tpl +++ b/mybatis-flex-codegen/src/main/resources/templates/enjoy/tableDef.tpl @@ -20,7 +20,7 @@ public class #(tableDefClassName) extends TableDef { #end 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)() { super("#(schema)", "#(table.name)");