lyhzzz 1 year ago
parent
commit
a0225c06e4

+ 3 - 0
src/main/java/com/fdkankan/agent/service/impl/CameraServiceImpl.java

@@ -64,6 +64,9 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             }
             if(!param.getCameraIds().isEmpty()){
                 List<Long> newCameraIds = param.getCameraIds().stream().filter(subCameraIds::contains).collect(Collectors.toList());
+                if(newCameraIds.isEmpty()){
+                    return PageInfo.PageInfo(new Page(param.getPageNum(),param.getPageSize()));
+                }
                 param.setCameraIds(newCameraIds);
             }else {
                 param.setCameraIds(subCameraIds);

+ 3 - 0
src/main/java/com/fdkankan/agent/service/impl/SceneProServiceImpl.java

@@ -127,6 +127,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(!param.getCameraIds().isEmpty()){
                 List<Long> newCameraIds = param.getCameraIds().stream().filter(subCameraIds::contains).collect(Collectors.toList());
                 param.setCameraIds(newCameraIds);
+                if(newCameraIds.isEmpty()){
+                    return PageInfo.PageInfo(new Page(param.getPageNum(),param.getPageSize()));
+                }
             }else {
                 param.setCameraIds(subCameraIds);
             }