From 74d2e57734ed157c2b0bdd2506cb04efd0378ede Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 23 Feb 2024 13:36:31 +0800
Subject: [PATCH] Merge branch 'jtdev' into 20240222-patrol

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
index 625a726..26107fc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
@@ -1745,10 +1745,10 @@
         </if>
 
         <if test="vo.startTime != null and vo.startTime != ''">
-            AND NAG.time &gt;= #{dam.startTime}
+            AND NAG.time &gt;= #{vo.startTime}
         </if>
         <if test="vo.endTime != null and vo.endTime !='' ">
-            AND NAG.time &lt;= #{dam.endTime}
+            AND NAG.time &lt;= #{vo.endTime}
         </if>
 
         <if test="vo.level != null and vo.level !='' ">

--
Gitblit v1.9.3