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