From 8a89d91911edec8a3bd0492037b73ccaf5f56f72 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Fri, 7 Jul 2023 22:07:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20large=20=E5=AD=97=E6=AE=B5=E6=88=96=E8=80=85=20logicDelete?=
 =?UTF-8?q?=20=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=BA=94=E8=A2=AB=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=9C=A8=20default=5Fcolumn=20=E4=B8=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mybatisflex/codegen/entity/Column.java   | 11 ++++++-----
 .../src/main/resources/templates/enjoy/tableDef.tpl   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

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)");

From c9269ad20f676e9342d8a7ad4b7470c3774812fa Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Fri, 7 Jul 2023 22:07:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?test:=20=E6=B5=8B=E8=AF=95=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=20tableDef=20=E8=BE=85=E5=8A=A9=E7=B1=BB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mybatisflex/codegen/test/GeneratorTest.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/GeneratorTest.java b/mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/GeneratorTest.java
index a3aa3dbe..97a501ce 100644
--- a/mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/GeneratorTest.java
+++ b/mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/GeneratorTest.java
@@ -16,7 +16,6 @@
 
 package com.mybatisflex.codegen.test;
 
-import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.codegen.Generator;
 import com.mybatisflex.codegen.config.ColumnConfig;
 import com.mybatisflex.codegen.config.GlobalConfig;
@@ -24,6 +23,7 @@ import com.mybatisflex.codegen.config.TableConfig;
 import com.mybatisflex.codegen.config.TableDefConfig;
 import com.mybatisflex.spring.service.impl.CacheableServiceImpl;
 import com.zaxxer.hikari.HikariDataSource;
+import org.junit.Test;
 
 import java.util.function.UnaryOperator;
 
@@ -149,7 +149,7 @@ public class GeneratorTest {
         generator.generate();
     }
 
-//    @Test
+    @Test
     public void testCodeGen3() {
         //配置数据源
         HikariDataSource dataSource = new HikariDataSource();
@@ -176,16 +176,20 @@ public class GeneratorTest {
         ColumnConfig columnConfig = new ColumnConfig();
         columnConfig.setColumnName("phonenumber");
         columnConfig.setLarge(true);
-        columnConfig.setKeyType(KeyType.None);
 
         TableConfig tableConfig = new TableConfig();
         tableConfig.setTableName("sys_user");
         tableConfig.addColumnConfig(columnConfig);
 
+        ColumnConfig logicDelete = new ColumnConfig();
+        logicDelete.setColumnName("del_flag");
+        logicDelete.setLogicDelete(true);
+
         //设置表前缀和只生成哪些表
         globalConfig.getStrategyConfig()
                 .setTablePrefix("sys_")
                 .setGenerateTable("sys_user")
+                .setColumnConfig(logicDelete)
                 .setTableConfig(tableConfig);
 
         //配置生成 tableDef