From 74e71e97f8292f8b600b903aed603c4fbe5de9c8 Mon Sep 17 00:00:00 2001 From: wenlele Date: Thu, 27 Oct 2022 18:18:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=BC=96=E5=8F=B7=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/app/lib/controllers/camera/index.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js index 7971126..3aa11e4 100644 --- a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js +++ b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js @@ -78,8 +78,10 @@ async function getCameraProject (ctx, next) { findOption.where.externalDomain = externalDomain } if (serialNo) { - findOption.where.serialNo = { $in: serialNo.split(',') } - findOption.where.topSerialNo = { $in: serialNo.split(',') } + findOption.where['$or'] = { + serialNo: { $in: serialNo.split(',') }, + topSerialNo: { $in: serialNo.split(',') } + } } if (state) { if (state == 'DISABLED') { @@ -150,7 +152,7 @@ async function getCameraProject (ctx, next) { // if (camera.type != 'yingshi') { // const playUrl = await getPlayUrl({ topSerialNo: camera.topSerialNo, serialNo: camera.serialNo }) - // camera.gbCamera.dataValues.playUrl = playUrl + // camera.gbCamera.dataValues.playUrl = playUrl // } }