From ebfdae3d14ff695a6221662df2d742142c4df6a4 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Thu, 22 Jun 2023 13:02:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AD=96=E7=95=A5=E4=B8=AD=E7=9A=84=20s?= =?UTF-8?q?chema=20=E5=92=8C=20tableConfig=20=E4=B8=AD=E7=9A=84=20schema?= =?UTF-8?q?=20=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=A5=20tab?= =?UTF-8?q?leConfig=20=E4=B8=AD=E9=85=8D=E7=BD=AE=E7=9A=84=20schema=20?= =?UTF-8?q?=E4=B8=BA=E4=B8=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mybatisflex/codegen/entity/Table.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 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 c0e96cc0..3a21c971 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 @@ -203,14 +203,27 @@ public class Table { tableAnnotation.append("@Table(value = \"").append(name).append("\""); - if (StringUtil.isNotBlank(schema)) { - tableAnnotation.append(", schema = \"").append(schema).append("\""); + String globalSchema; + + if (tableConfig == null) { + // 未配置 tableConfig 以策略中的 schema 为主 + globalSchema = schema; + } else if (StringUtil.isBlank(tableConfig.getSchema())) { + // 配置 tableConfig 但未指定 schema 还是以策略中的 schema 为主 + globalSchema = schema; + } else { + // 以用户设置的 tableConfig 中的 schema 为主 + globalSchema = null; + } + + if (StringUtil.isNotBlank(globalSchema)) { + tableAnnotation.append(", schema = \"").append(globalSchema).append("\""); } if (tableConfig != null) { -// if (tableConfig.getSchema() != null) { -// tableAnnotation.append(", schema = \"").append(tableConfig.getSchema()).append("\""); -// } + if (StringUtil.isNotBlank(tableConfig.getSchema())) { + tableAnnotation.append(", schema = \"").append(tableConfig.getSchema()).append("\""); + } if (tableConfig.getCamelToUnderline() != null) { tableAnnotation.append(", camelToUnderline = \"").append(tableConfig.getCamelToUnderline()).append("\""); }