From 3007dbac2e83ed00dd77cd9fd3e42b05ab3eb7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?MOSHOW=E9=83=91=E9=94=B4?= <moshowgame@126.com>
Date: Wed, 24 Mar 2021 21:53:05 +0800
Subject: [PATCH] =?UTF-8?q?|2021.03.24|=E4=BF=AE=E5=A4=8DMybatis.XML?=
 =?UTF-8?q?=E4=B8=AD=E7=BC=BA=E5=A4=B1test=3D=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82(=E6=84=9F=E8=B0=A2@BWHN/YUEHUI?=
 =?UTF-8?q?=E7=9A=84=E5=8F=8D=E9=A6=88)=E3=80=82|?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

|2021.03.24|修复Mybatis.XML中缺失test=关键字问题。(感谢@BWHN/YUEHUI的反馈)。|
---
 README.md                                                   | 1 +
 .../resources/templates/code-generator/mybatis/mybatis.ftl  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f775a60..be7f3ef 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,7 @@ Thanks for `JetBrains` providing us the `Licenses for Open Source Development` 
 # Update Logs
 |更新日期|更新内容|
 |:----|:----|
+|2021.03.24|修复Mybatis.XML中缺失test=关键字问题。(感谢@BWHN/YUEHUI的反馈)。|
 |2021.01.18|OEM信息优化，支持多配置文件模式，支持在application*.yml自定义信息，以及切换local/cdn模式。|
 |2021.01.17|生成后自动trim掉前后空格输出。<br>完善ReadMe文档。<br>优化云CDN引入部分。<br>优化returnUtil部分。<br>表明前缀选项(感谢@wwlg的建议)。 <br>是否带字段注释设置(感谢@fengpojian的建议)。<br>优化Mybatis的''!=判断(感谢@zhongsb的建议)。<br>Mybatis-Plus增加Service层(感谢@yf466532479的建议)。 |
 |2021.01.16|全新3.0版本：<br>一、前端半vue半js化，更多动态加载项。<br>二、支持更多生成设置，优化生成场景。<br>三、js导入支持本地/CDN模式，支持断网环境轻松使用。|
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl
index 9a583f5..3406a1c 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl
@@ -25,7 +25,7 @@
             <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
                 <#list classInfo.fieldList as fieldItem >
                     <#if fieldItem.columnName != "id" >
-                        <if "null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
+                        <if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
                         ${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
                         ${r"</if>"}
                     </#if>
@@ -41,7 +41,7 @@
                         NOW()<#if fieldItem_has_next>,</#if>
                     ${r"</if>"}
                     <#else>-->
-                        <if "null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
+                        <if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
                         ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>
                         ${r"</if>"}
                     <#--</#if>-->
@@ -61,7 +61,7 @@
         <set>
             <#list classInfo.fieldList as fieldItem >
                 <#if fieldItem.columnName != "id" && fieldItem.columnName != "AddTime" && fieldItem.columnName != "UpdateTime" >
-                    <if "null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"}
+                    <if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"}
                 </#if>
             </#list>
         </set>