1

src/main/java/com/fdkankan/agent/service/impl/SceneProServiceImpl.java

@@ -95,9 +95,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         List<CameraDetail> details = cameraDetailService.getListByAgentId(param.getAgentId());
         List<Long> cameraIds = details.stream().map(CameraDetail::getCameraId).collect(Collectors.toList());
-        if(param.getCameraIds() == null || param.getCameraIds().isEmpty()){
+        if(param.getCameraIds() == null ){
             param.setCameraIds(cameraIds);
         }else {
+            if(param.getCameraIds().isEmpty()){
+                return PageInfo.PageInfo(new Page(param.getPageNum(),param.getPageSize()));
+            }
             List<Long> intersection = cameraIds.stream().filter(param.getCameraIds()::contains).collect(Collectors.toList());
             param.setCameraIds(intersection);
         }