From e133a0410811fd5c4c9514c8b140d5a34c7ea815 Mon Sep 17 00:00:00 2001 From: hewei Date: Fri, 19 May 2017 10:56:39 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fixed:=20=E5=AF=B9=E4=BA=8E=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AE=9E=E7=8E=B0WithBLOBs=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=9F=BA=E5=87=86=E6=98=AF=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=A1=A8=E5=AD=98=E5=9C=A8BLOBs=E7=B1=BB=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/plugins/SelectOneByExamplePlugin.java | 7 ++++--- .../com/itfsw/mybatis/generator/plugins/UpsertPlugin.java | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/itfsw/mybatis/generator/plugins/SelectOneByExamplePlugin.java b/src/main/java/com/itfsw/mybatis/generator/plugins/SelectOneByExamplePlugin.java index 98c88d7..e1155a7 100644 --- a/src/main/java/com/itfsw/mybatis/generator/plugins/SelectOneByExamplePlugin.java +++ b/src/main/java/com/itfsw/mybatis/generator/plugins/SelectOneByExamplePlugin.java @@ -64,8 +64,8 @@ public class SelectOneByExamplePlugin extends BasePlugin { interfaze.addMethod(method); logger.debug("itfsw(查询单条数据插件):"+interfaze.getType().getShortName()+"增加selectOneByExample方法。"); - // 方法生成 selectOneByExampleWithBLOBs - if (introspectedTable.getRules().generateRecordWithBLOBsClass()){ + // 方法生成 selectOneByExampleWithBLOBs !!! 注意这里的行为不以有没有生成Model 的 WithBLOBs类为基准 + if (introspectedTable.hasBLOBColumns()){ // 方法生成 selectOneByExample Method method1 = JavaElementGeneratorTools.generateMethod( METHOD_SELECT_ONE_BY_EXAMPLE_WITH_BLOBS, @@ -134,7 +134,8 @@ public class SelectOneByExamplePlugin extends BasePlugin { logger.debug("itfsw(查询单条数据插件):"+introspectedTable.getMyBatis3XmlMapperFileName()+"增加selectOneByExample方法。"); // ------------------------------------ selectOneByExampleWithBLOBs ---------------------------------- - if (introspectedTable.getRules().generateRecordWithBLOBsClass()){ + // !!! 注意这里的行为不以有没有生成Model 的 WithBLOBs类为基准 + if (introspectedTable.hasBLOBColumns()){ // 生成查询语句 XmlElement selectOneWithBLOBsElement = new XmlElement("select"); // 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated) diff --git a/src/main/java/com/itfsw/mybatis/generator/plugins/UpsertPlugin.java b/src/main/java/com/itfsw/mybatis/generator/plugins/UpsertPlugin.java index 20fe0f5..438ac33 100644 --- a/src/main/java/com/itfsw/mybatis/generator/plugins/UpsertPlugin.java +++ b/src/main/java/com/itfsw/mybatis/generator/plugins/UpsertPlugin.java @@ -141,7 +141,8 @@ public class UpsertPlugin extends BasePlugin { logger.debug("itfsw(存在即更新插件):" + interfaze.getType().getShortName() + "增加upsertByExampleSelective方法。"); } - if (introspectedTable.getRules().generateRecordWithBLOBsClass()){ + // !!! 注意这里的行为不以有没有生成Model 的 WithBLOBs类为基准 + if (introspectedTable.hasBLOBColumns()){ // ====================================== 1. upsertWithBLOBs ====================================== Method mUpsertWithBLOBs = JavaElementGeneratorTools.generateMethod( METHOD_UPSERT_WITH_BLOBS, @@ -211,7 +212,8 @@ public class UpsertPlugin extends BasePlugin { this.generateXmlElementWithoutBLOBs(document, introspectedTable); - if (introspectedTable.getRules().generateRecordWithBLOBsClass()){ + // !!! 注意这里的行为不以有没有生成Model 的 WithBLOBs类为基准 + if (introspectedTable.hasBLOBColumns()){ this.generateXmlElementWithBLOBs(document, introspectedTable); }