Merge branch 'hotfix-旧版相机入库数据兼容' into test

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -256,11 +256,13 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         Camera camera = cameraService.getBySnCode(mac);
         if(Objects.isNull(camera)){
-            cameraService.getOne(new LambdaQueryWrapper<Camera>()
+            camera = cameraService.getOne(new LambdaQueryWrapper<Camera>()
                     .like(Camera::getChildName, mac)
                     .or().like(Camera::getSnCode, mac)
                     .or().like(Camera::getWifiName, mac));
-            throw new BusinessException(ErrorCode.FAILURE_CODE_7010);
+            if(Objects.isNull(camera)){
+                throw new BusinessException(ErrorCode.FAILURE_CODE_7010);
+            }
         }
         CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
         if (Objects.isNull(cameraDetail)) {