From 7910bbe39adf8e5fcd07b576a26d49f96aef6090 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 28 十一月 2023 16:46:17 +0800
Subject: [PATCH] 去除FastJsonConfig中的JSONWriter.Feature.WriteNullNumberAsZero,

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
index c5a0f21..7af8c7e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -12,7 +12,7 @@
     <result column="divideId" jdbcType="BIGINT" property="divideId" />
     <result column="typeId" jdbcType="BIGINT" property="typeId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="num" jdbcType="INTEGER" property="num" />
+    <result column="num" jdbcType="VARCHAR" property="num" />
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="idCard" jdbcType="VARCHAR" property="idcard" />
     <result column="area" jdbcType="FLOAT" property="area" />
@@ -29,8 +29,9 @@
   </sql>
   <sql id="part_Column_List">
     <!--@mbg.generated-->
-      ${alias}.id, ${alias}.countyId, ${alias}.townId, ${alias}.villageId, ${alias}.blockId, ${alias}.divideId, ${alias}.typeId, ${alias}.name, ${alias}.num, ${alias}.phone, ${alias}.idCard, ${alias}.area, ${alias}.district,${alias}.address, ${alias}.remark,
-      ${alias}.disabled
+      ${alias}.id, ${alias}.countyId, ${alias}.townId, ${alias}.villageId, ${alias}.blockId, ${alias}.divideId, ${alias}.typeId,
+      ${alias}.`name`, ${alias}.num, ${alias}.phone, ${alias}.idCard, ${alias}.area, ${alias}.district,${alias}.address,
+      ${alias}.remark, ${alias}.disabled
   </sql>
 
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -67,13 +68,13 @@
                 bc.blockId = #{blockId,jdbcType=BIGINT} and
             </if>
             <if test="name != null">
-                bc.name like concat('%', #{name}, '%') and
+                bc.`name` like concat('%', #{name}, '%') and
             </if>
             <if test="num != null">
-                bc.num = '#{num,jdbcType=VARCHAR}' and
+                bc.num = #{num,jdbcType=VARCHAR} and
             </if>
             <if test="phone != null">
-                bc.phone = '#{phone,jdbcType=VARCHAR}' and
+                bc.phone = #{phone,jdbcType=VARCHAR} and
             </if>
         </trim>
     </select>
@@ -83,8 +84,8 @@
         <include refid="part_Column_List" >
             <property name="alias" value="bc"/>
         </include>,
-        bbk.name blockName,
-        bct.name typeName
+        bbk.`name` blockName,
+        bct.`name` typeName
         from ba_client bc
         left join ba_block bbk on bc.blockId = bbk.id
         left join ba_client_type bct on bc.typeId = bct.id
@@ -103,19 +104,19 @@
                 blockId = #{blockId,jdbcType=BIGINT} and
             </if>
             <if test="name != null">
-                bc.name like concat('%', #{name}, '%') and
+                bc.`name` like concat('%', #{name}, '%') and
             </if>
             <if test="num != null">
-                bc.num = '#{num,jdbcType=VARCHAR}' and
+                bc.num = #{num,jdbcType=VARCHAR} and
             </if>
             <if test="phone != null">
-                bc.phone = '#{phone,jdbcType=VARCHAR}' and
+                bc.phone = #{phone,jdbcType=VARCHAR} and
             </if>
         </trim>
         order by bc.id DESC
         <trim prefix="limit " >
             <if test="start != null and count != null">
-                #{start}, #{count}
+                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
             </if>
         </trim>
     </select>
@@ -129,7 +130,7 @@
         values (#{id,jdbcType=BIGINT}, #{countyId,jdbcType=BIGINT},
           #{townId,jdbcType=BIGINT}, #{villageId,jdbcType=BIGINT},
           #{blockId,jdbcType=BIGINT}, #{divideId,jdbcType=BIGINT}, #{typeId,jdbcType=BIGINT},
-          #{name,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER},
+          #{name,jdbcType=VARCHAR}, #{num,jdbcType=VARCHAR},
           #{phone,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},
           #{area,jdbcType=FLOAT}, #{district,jdbcType=VARCHAR},
           #{address,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},
@@ -219,7 +220,7 @@
             #{name,jdbcType=VARCHAR},
           </if>
           <if test="num != null">
-            #{num,jdbcType=INTEGER},
+            #{num,jdbcType=VARCHAR},
           </if>
           <if test="phone != null">
             #{phone,jdbcType=VARCHAR},
@@ -272,7 +273,7 @@
                 'name' = #{name,jdbcType=VARCHAR},
             </if>
             <if test="num != null">
-                num = #{num,jdbcType=INTEGER},
+                num = #{num,jdbcType=VARCHAR},
             </if>
             <if test="phone != null">
                 phone = #{phone,jdbcType=VARCHAR},
@@ -312,7 +313,7 @@
             blockId = #{blockId,jdbcType=BIGINT},
             typeId = #{typeId,jdbcType=BIGINT},
             `name` = #{name,jdbcType=VARCHAR},
-            num = #{num,jdbcType=INTEGER},
+            num = #{num,jdbcType=VARCHAR},
             phone = #{phone,jdbcType=VARCHAR},
             idcard = #{idcard,jdbcType=VARCHAR},
             area = #{area,jdbcType=FLOAT},

--
Gitblit v1.8.0