Merge branch 'fusion-1.7'

src/main/java/com/fdkankan/ucenter/service/impl/FusionService.java

@@ -65,6 +65,14 @@ public class FusionService implements IFusionService {
                 return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
             }
         }
+        if(StringUtils.isNotBlank(param.getSnCode())){
+            List<Camera> cameraLikeSnCode = cameraService.getCameraLikeSnCode(param.getSnCode());
+            if(cameraLikeSnCode.isEmpty()){
+                return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
+            }
+            List<Long> cameraIds = cameraLikeSnCode.stream().map(Camera::getId).collect(Collectors.toList());
+            wrapper.in(ScenePlus::getCameraId,cameraIds);
+        }
         if(StringUtils.isNotBlank(token)){
             User user = userService.getByToken(token);
             if(user == null){