From d3820a2552975f039de1181bb84aa823d9494562 Mon Sep 17 00:00:00 2001
From: chendong <>
Date: Tue, 11 Jan 2022 19:12:46 +0800
Subject: [PATCH] =?UTF-8?q?mapper=E6=96=87=E4=BB=B6=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E9=9D=9E=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E5=88=A4=E7=A9=BA=20and=20''!=3D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/code-generator/mybatis/mybatis.ftl  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 c80073a..d22cac0 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 test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
+                        <if test="null != ${fieldItem.fieldName} <#if fieldItem.fieldClass ="String">and '' != ${fieldItem.fieldName}</#if>">
                         ${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
                         ${r"</if>"}
                     </#if>
@@ -41,7 +41,7 @@
                         NOW()<#if fieldItem_has_next>,</#if>
                     ${r"</if>"}
                     <#else>-->
-                        <if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
+                        <if test="null != ${fieldItem.fieldName} <#if fieldItem.fieldClass ="String">and '' != ${fieldItem.fieldName}</#if>">
                         ${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 test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"}
+                    <if test="null != ${fieldItem.fieldName} <#if fieldItem.fieldClass ="String">and '' != ${fieldItem.fieldName}</#if>">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"}
                 </#if>
             </#list>
         </set>