From 25a7186138a2b076bcc71238a937da98b8e9a7fe Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 14 九月 2024 16:29:52 +0800
Subject: [PATCH] 2024-09-14 朱宝民 创建了一个新的获取充值记录接口,管理平台使用

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
index d0fa274..5fc59a3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
@@ -396,10 +396,10 @@
         <if test="valveState != null">
             and rash.valve_state = #{valveState,jdbcType=TINYINT}
         </if>
-        <if test="intakeId != null">
+        <if test="intakeId != null and intakeId != '' ">
             and rash.intake_id = #{intakeId}
         </if>
-        <if test="intakeName != null">
+        <if test="intakeName != null and intakeName != '' ">
             and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
         </if>
         <if test="startDt != null">
@@ -480,10 +480,10 @@
             <if test="valveState != null">
                 and rash.valve_state = #{valveState,jdbcType=TINYINT}
             </if>
-            <if test="intakeId != null">
+            <if test="intakeId != null and intakeId != '' ">
                 and rash.intake_id = #{intakeId}
             </if>
-            <if test="intakeName != null">
+            <if test="intakeName != null and intakeName != '' ">
                 and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
             </if>
             <if test="startDt != null">

--
Gitblit v1.8.0