1

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

@@ -62,7 +62,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             if(subCameraIds.isEmpty()){
                 return PageInfo.PageInfo(new Page(param.getPageNum(),param.getPageSize()));
             }
-            if(!param.getCameraIds().isEmpty()){
+            if(param.getCameraIds() != null && !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()));

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

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