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 // } }