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/BaBlockMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 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">
--
Gitblit v1.8.0