From e9e91d14c9436b29292054e3de0445dbb7d8601c Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 12 六月 2024 09:17:14 +0800
Subject: [PATCH] 修改 检测控制取水口列表 增加排序asc

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

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">

--
Gitblit v1.8.0