From 201518a621d0d5f3c2040217950b10a5eaba22e6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 七月 2025 14:51:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TEarlyWarningMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TEarlyWarningMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TEarlyWarningMapper.xml
index c63767b..d439dff 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TEarlyWarningMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TEarlyWarningMapper.xml
@@ -29,7 +29,11 @@
<if test="query.startTime != null and startTime != ''">
and (t1.create_time between #{startTime} and #{endTime})
</if>
+ <if test="query.warningType != null ">
+ and t1.warning_type= #{query.warningType}
+ </if>
and t1.`disabled` = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ order by t1.create_time desc
</select>
</mapper>
--
Gitblit v1.7.1