From 6732a84a5a3648b82ac029437313a49ea30876e3 Mon Sep 17 00:00:00 2001 From: Jerry Zheng Date: Sat, 29 Jul 2023 16:24:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=20ignoreColumns=20=E5=8F=98=E6=9B=B4=E4=B8=BA?= =?UTF-8?q?=E5=8F=AA=E5=AF=B9Entity=E7=94=9F=E6=88=90=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=9E=9C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mybatisflex/codegen/entity/Table.java | 6 ------ .../mybatisflex/codegen/generator/impl/EntityGenerator.java | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java index 306afc57..fe6ac1c2 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java @@ -131,12 +131,6 @@ public class Table { public void addColumn(Column column) { - //排除忽略列 - if (globalConfig.getStrategyConfig().getIgnoreColumns() != null && - globalConfig.getStrategyConfig().getIgnoreColumns().contains(column.getName().toLowerCase())) { - return; - } - //主键 if (primaryKeys != null && primaryKeys.contains(column.getName())) { column.setPrimaryKey(true); diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java index b7f87bf5..28600499 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java @@ -62,7 +62,10 @@ public class EntityGenerator implements IGenerator { if (entityJavaFile.exists() && !entityConfig.isOverwriteEnable()) { return; } - + //排除忽略列 + if (globalConfig.getStrategyConfig().getIgnoreColumns() != null) { + table.getColumns().removeIf(column -> globalConfig.getStrategyConfig().getIgnoreColumns().contains(column.getName().toLowerCase())); + } Map params = new HashMap<>(4); params.put("table", table);