From 88cd0922634e6bb20da6ea64209bd62d094b6b4c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十二月 2023 15:05:57 +0800
Subject: [PATCH] 测试git冲突
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 1685fd1..7af8c7e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -68,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>
@@ -84,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
@@ -104,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>
--
Gitblit v1.8.0