From 014b2f06e5b6b72c86134279e5766f1e413b315c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 07 十二月 2023 16:34:33 +0800
Subject: [PATCH] Mapper.xml文件中，查询条件中字符串属性条件判断，增加不是空串的判断。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 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 0d06d71..bca158d 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="VARCHAR" property="num" />
+    <result column="num" jdbcType="INTEGER" property="num" />
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="idCard" jdbcType="VARCHAR" property="idcard" />
     <result column="area" jdbcType="FLOAT" property="area" />
@@ -66,14 +66,14 @@
             <if test="blockId != null">
                 bc.blockId = #{blockId,jdbcType=BIGINT} and
             </if>
-            <if test="name != null">
-                bc.name like concat('%', #{name}, '%') and
+            <if test="name != null and name != ''">
+                bc.`name` like concat('%', #{name}, '%') and
             </if>
-            <if test="num != null">
-                bc.num = '#{num,jdbcType=VARCHAR}' and
+            <if test="num != null and num != ''">
+                bc.num = #{num,jdbcType=VARCHAR} and
             </if>
-            <if test="phone != null">
-                bc.phone = '#{phone,jdbcType=VARCHAR}' and
+            <if test="phone != null and phone != ''">
+                bc.phone = #{phone,jdbcType=VARCHAR} and
             </if>
         </trim>
     </select>
@@ -83,8 +83,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,23 +103,23 @@
                 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>
-    <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
+    <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
         <!--@mbg.generated-->
         insert into ba_client (id, countyId, townId, villageId, blockId, divideId,
           typeId, `name`, num, phone,
@@ -129,7 +129,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=VARCHAR},
+          #{name,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER},
           #{phone,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},
           #{area,jdbcType=FLOAT}, #{district,jdbcType=VARCHAR},
           #{address,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},
@@ -219,7 +219,7 @@
             #{name,jdbcType=VARCHAR},
           </if>
           <if test="num != null">
-            #{num,jdbcType=VARCHAR},
+            #{num,jdbcType=INTEGER},
           </if>
           <if test="phone != null">
             #{phone,jdbcType=VARCHAR},
@@ -272,7 +272,7 @@
                 'name' = #{name,jdbcType=VARCHAR},
             </if>
             <if test="num != null">
-                num = #{num,jdbcType=VARCHAR},
+                num = #{num,jdbcType=INTEGER},
             </if>
             <if test="phone != null">
                 phone = #{phone,jdbcType=VARCHAR},
@@ -312,7 +312,7 @@
             blockId = #{blockId,jdbcType=BIGINT},
             typeId = #{typeId,jdbcType=BIGINT},
             `name` = #{name,jdbcType=VARCHAR},
-            num = #{num,jdbcType=VARCHAR},
+            num = #{num,jdbcType=INTEGER},
             phone = #{phone,jdbcType=VARCHAR},
             idcard = #{idcard,jdbcType=VARCHAR},
             area = #{area,jdbcType=FLOAT},

--
Gitblit v1.8.0