From 3a6ac2949244e6a3f70e165cd3802f1d90b78819 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 十月 2024 11:20:41 +0800
Subject: [PATCH] 格式化SQL语句

---
 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