Merge pull request #128 from to404/master

mapper文件生成，去掉非字符串判空 and ''!=

Author: moshowgame

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>