From af61e5f6de17791b5f8a07d3324c272a62eca5bf Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 26 七月 2024 10:24:32 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 55279e8..d0fa274 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml
@@ -396,6 +396,9 @@
         <if test="valveState != null">
             and rash.valve_state = #{valveState,jdbcType=TINYINT}
         </if>
+        <if test="intakeId != null">
+            and rash.intake_id = #{intakeId}
+        </if>
         <if test="intakeName != null">
             and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
         </if>
@@ -477,6 +480,9 @@
             <if test="valveState != null">
                 and rash.valve_state = #{valveState,jdbcType=TINYINT}
             </if>
+            <if test="intakeId != null">
+                and rash.intake_id = #{intakeId}
+            </if>
             <if test="intakeName != null">
                 and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
             </if>

--
Gitblit v1.8.0