Merge remote-tracking branch 'origin/dev' into dev

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/controller/SpeakerController.java

@@ -93,6 +93,9 @@ public class SpeakerController {
     @RequestMapping("/getDeviceListBySub")
     @ApiOperation(value = "获取设备列表", notes = "获取设备列表")
     public AjaxResult getDeviceList(Integer page, Integer pageSize,Long floorId, Long subId) {
+        if(StringUtils.isNull(subId)){
+            return AjaxResult.success();
+        }
         R r=remoteLaboratoryService.getSpeakerBySub(floorId, subId);
         if(r.getCode()!=200){
             return AjaxResult.error("获取设备列表失败！");