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/RmAlarmStateLastMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
index 2134c01..187f1e9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -379,7 +379,7 @@
and rasl.valve_state = #{valveState,jdbcType=TINYINT}
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and rasl.intake_id = #{intakeId}
</if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
@@ -463,7 +463,7 @@
and rasl.valve_state = #{valveState,jdbcType=TINYINT}
</if>
<if test="intakeId != null">
- and rash.intake_id = #{intakeId}
+ and rasl.intake_id = #{intakeId}
</if>
<if test="intakeName != null">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
--
Gitblit v1.8.0