From 29807fea73899a5b775eb2c7d8e1c05ea8bc0c3d Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 02 八月 2024 17:00:31 +0800
Subject: [PATCH] 2024-08-02 朱宝民 优化获取全部取水口接口，包含经纬度及12小时之内的报警信息

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
index 997fdf5..2e25990 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
@@ -194,11 +194,11 @@
     from rm_client_amount_day_last rcadl
     Left join se_client sc on sc.id = rcadl.client_id
     <where>
-      <if test="clientName != null">
+      <if test="clientName != null and clientName != '' ">
         and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
       </if>
-      <if test="clientId != null">
-        and rcadl.client_id = #{clientId}
+      <if test="clientId != null and clientId != ''">
+        and rcad.client_id = #{clientId}
       </if>
       <if test="startDt != null">
         and rcadl.dt &gt;= #{startDt,jdbcType=DATE}
@@ -225,11 +225,11 @@
     from rm_client_amount_day_last rcadl
     Left join se_client sc on sc.id = rcadl.client_id
     <where>
-      <if test="clientName != null">
+      <if test="clientName != null and clientName != '' ">
         and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
       </if>
-      <if test="clientId != null">
-        and rcadl.client_id = #{clientId}
+      <if test="clientId != null and clientId != ''">
+        and rcad.client_id = #{clientId}
       </if>
       <if test="startDt != null">
         and rcadl.dt &gt;= #{startDt,jdbcType=DATE}

--
Gitblit v1.8.0