From c8b2311124fd5785b90d2fb4bd9ae0078aa13055 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 03 一月 2025 11:26:08 +0800
Subject: [PATCH] 1、查询农户年月的各日用水信息; 2、修改文档名称为《管系统系统增加一个客户的方法》; 3、增加一个文档《洒泉职业技术学院设备配置》。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 a59feb6..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">
@@ -101,7 +101,7 @@
       </if>
     </trim>
   </select>
-  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
+  <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
     <!--@mbg.generated-->
     insert into ba_divide (id, `name`, countyId, 
       townId, villageId, blockId, 

--
Gitblit v1.8.0