From d6670149331bbdeda4b0573927c13d36225a09c1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 04 十二月 2023 15:52:08 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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..6be18b6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -67,13 +67,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 +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,

--
Gitblit v1.8.0