From 49b93cbbbadb7fc951c71532b02d22100dbc9b11 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 07 五月 2025 14:58:42 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 53147f1..cb93292 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -396,10 +396,10 @@
<if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
- <if test="startDt != null">
+ <if test="startDt != null and startDt != ''">
and rasl.dt >= #{startDt,jdbcType=TIMESTAMP}
</if>
- <if test="endDt != null">
+ <if test="endDt != null and endDt != ''">
and rasl.dt <= #{endDt,jdbcType=TIMESTAMP}
</if>
</where>
@@ -480,10 +480,10 @@
<if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
- <if test="startDt != null">
+ <if test="startDt != null and startDt != ''">
and rasl.dt >= #{startDt,jdbcType=TIMESTAMP}
</if>
- <if test="endDt != null">
+ <if test="endDt != null and endDt != ''">
and rasl.dt <= #{endDt,jdbcType=TIMESTAMP}
</if>
</where>
--
Gitblit v1.8.0