From ea84f710b449f931562ce649ff44cab05c15d9e0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 10 七月 2024 18:07:15 +0800
Subject: [PATCH] 1、实现用水户日用水量水费统计; 2、靳总IC卡结构中卡号(用户号)由10位改为17位,相应协议也变化。

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