From 1fbf81e162e6e16ffd927b736c3192ea3023c88e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 07 十二月 2023 16:38:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml | 4 ++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml | 6 +++---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml | 12 ++++++------
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 8 ++++----
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 4 ++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml | 12 ++++++------
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
index 0d21824..1110ae8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -40,13 +40,13 @@
count(*)
from ba_block
<trim prefix="where " suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
+ <if test="header != null and header != ''">
header like concat('%', #{header}, '%') and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone != ''">
phone = '#{phone,jdbcType=VARCHAR}' and
</if>
<if test="area != null">
@@ -60,13 +60,13 @@
<include refid="Base_Column_List" />
from ba_block
<trim prefix="where " suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
+ <if test="header != null and header != ''">
header = '#{header,jdbcType=VARCHAR}' and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone != ''">
phone = '#{phone,jdbcType=VARCHAR}' and
</if>
<if test="area != null">
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 6be18b6..bca158d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -66,13 +66,13 @@
<if test="blockId != null">
bc.blockId = #{blockId,jdbcType=BIGINT} and
</if>
- <if test="name != null">
+ <if test="name != null and name != ''">
bc.`name` like concat('%', #{name}, '%') and
</if>
- <if test="num != null">
+ <if test="num != null and num != ''">
bc.num = #{num,jdbcType=VARCHAR} and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone != ''">
bc.phone = #{phone,jdbcType=VARCHAR} and
</if>
</trim>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
index 195831a..de4c4e3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
@@ -37,7 +37,7 @@
count(*)
from ba_client_type
<trim prefix="where" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%') and
</if>
</trim>
@@ -48,7 +48,7 @@
<include refid="Base_Column_List" />
from ba_client_type
<trim prefix="where" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%')
</if>
</trim>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
index b0c2a9c..472ac7f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
@@ -52,13 +52,13 @@
left join ba_block bbk on bd.blockId = bbk.id
where bd.deleted != 1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
bd.name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
+ <if test="header != null and header != ''">
bd.header = '#{header,jdbcType=VARCHAR}' and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone != ''">
bd.phone = '#{phone,jdbcType=VARCHAR}' and
</if>
<if test="blockName != null">
@@ -81,13 +81,13 @@
left join ba_district bdtv on bd.villageId=bdtv.id
where bd.deleted != 1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
bd.name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
+ <if test="header != null and header != ''">
bd.header = '#{header,jdbcType=VARCHAR}' and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone != ''">
bd.phone = '#{phone,jdbcType=VARCHAR}' and
</if>
<if test="blockName != null">
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
index a18ba5d..20afb5d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -47,7 +47,7 @@
count(*)
from ba_role where deleted!=1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%')
</if>
</trim>
@@ -58,7 +58,7 @@
<include refid="part_Column_List" />
from ba_role where deleted!=1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%')
</if>
</trim>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index 4aa5498..c80eb58 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -66,10 +66,10 @@
from ba_user
where supperAdmin!=1 and deleted!=1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%') and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone !=''">
phone = #{phone,jdbcType=VARCHAR}
</if>
</trim>
@@ -84,10 +84,10 @@
left join ba_block bb on bu.blockId = bb.id
where bu.supperAdmin!=1 and bu.deleted!=1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
bu.name like concat('%', #{name}, '%') and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone !=''">
bu.phone = #{phone,jdbcType=VARCHAR}
</if>
</trim>
--
Gitblit v1.8.0