From d87f663d35658f5025fc1a051801bb8b72e85d5c Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Sun, 9 Oct 2022 11:11:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=91=8A=E8=AD=A6=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/alarm/video.js                | 2 +-
 script/{0.0.4 copy => 0.0.6}/schema/1.alert_table.sql | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename script/{0.0.4 copy => 0.0.6}/schema/1.alert_table.sql (100%)

diff --git a/api/app/lib/controllers/alarm/video.js b/api/app/lib/controllers/alarm/video.js
index bad951d..18df667 100644
--- a/api/app/lib/controllers/alarm/video.js
+++ b/api/app/lib/controllers/alarm/video.js
@@ -120,7 +120,7 @@ async function alarmList (ctx) {
                         camera_status_alarm.confirm_time AS confirmTime
                      
                      FROM camera_status_alarm
-                     LEFT JOIN camera
+                     INNER JOIN camera
                         ON camera.serial_no = camera_status_alarm.serial_no
                         AND camera.channel_no = camera_status_alarm.channel_no
                         ${cameraWhereOption.length ? 'AND ' + cameraWhereOption.join(' AND ') : ''}
diff --git a/script/0.0.4 copy/schema/1.alert_table.sql b/script/0.0.6/schema/1.alert_table.sql
similarity index 100%
rename from script/0.0.4 copy/schema/1.alert_table.sql
rename to script/0.0.6/schema/1.alert_table.sql