From 35c8aca3b8107ee2a4fbb5790ce1eeb70f4bb461 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 22 Mar 2024 18:15:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/log/dao/IDroneFlightLogMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/dji/sample/log/dao/IDroneFlightLogMapper.xml b/src/main/java/com/dji/sample/log/dao/IDroneFlightLogMapper.xml
index 5017573..caa2bc8 100644
--- a/src/main/java/com/dji/sample/log/dao/IDroneFlightLogMapper.xml
+++ b/src/main/java/com/dji/sample/log/dao/IDroneFlightLogMapper.xml
@@ -11,6 +11,9 @@
<if test="workspaceId != null and workspaceId != ''">
and fl.workspace_id = #{workspaceId}
</if>
+ <if test="deviceSn !=null and deviceSn != ''" >
+ and fl.device_sn = #{deviceSn}
+ </if>
ORDER BY fl.end_time DESC
</select>
</mapper>
--
Gitblit v1.9.3