From bdb9339d9723c39014d3b63a9e2c579ae09c5a0d Mon Sep 17 00:00:00 2001
From: luozuanshi <59036386@qq.com>
Date: Sun, 25 Apr 2021 15:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=AE=8C=E5=85=A8?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0sql=20=E4=B8=BAnull=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B9=9F=E6=9B=B4=E6=96=B0=E6=9B=BF=E6=8D=A2=E6=8E=89?=
 =?UTF-8?q?=E4=BA=86=E5=8E=9F=E6=9C=89=E7=9A=84""=E5=AD=97=E6=AE=B5,=20?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=9B=B4=E6=96=B0=E8=BF=87=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=83=BD=E8=AE=A4=E4=B8=BA=E9=85=8D=E7=BD=AE=E4=BA=86?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/generator/GenTableColumnMapper.xml | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index 47738ba7..9dd4612f 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -92,20 +92,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateGenTableColumn" parameterType="GenTableColumn">
         update gen_table_column
         <set>
-            column_comment = #{columnComment},
-            column_type = #{columnType},
-            java_type = #{javaType},
-            java_field = #{javaField},
-            is_insert = #{isInsert},
-            is_edit = #{isEdit},
-            is_list = #{isList},
-            is_query = #{isQuery},
-            is_required = #{isRequired},
-            query_type = #{queryType},
-            html_type = #{htmlType},
-            dict_type = #{dictType},
-            sort = #{sort},
-            update_by = #{updateBy},
+            <if test="columnComment != null and columnComment != ''">column_type = #{columnType},</if>
+            <if test="columnType != null and columnType != ''">column_type = #{columnType},</if>
+            <if test="javaType != null and javaType != ''">java_type = #{javaType},</if>
+            <if test="javaField != null and javaField != ''">java_field = #{javaField},</if>
+            <if test="isInsert != null and isInsert != ''">is_insert = #{isInsert},</if>
+            <if test="isEdit != null and isEdit != ''">is_edit = #{isEdit},</if>
+            <if test="isList != null and isList != ''">is_list = #{isList},</if>
+            <if test="isQuery != null and isQuery != ''">is_query = #{isQuery},</if>
+            <if test="isRequired != null and isRequired != ''"> is_required = #{isRequired},</if>
+            <if test="queryType != null and queryType != ''"> query_type = #{queryType},</if>
+            <if test="htmlType != null and htmlType != ''"> html_type = #{htmlType},</if>
+            <if test="dictType != null and dictType != ''"> dict_type = #{dictType},</if>
+            <if test="sort != null and sort != ''"> sort = #{sort},</if>
+            <if test="updateBy != null and updateBy != ''"> update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>
         where column_id = #{columnId}