Merge branch '2.6.9' into wvp-28181-2.0

2024-01-22 16:02:28 +08:00
parent 5a3b1c04d6 d68aebd409
commit e8770eec36
15 changed files with 32 additions and 2 deletions
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
@@ -197,7 +197,10 @@ public class CloudRecordController {
            @RequestParam(required = false) String mediaServerId,
            @RequestParam(required = false) Boolean isEnd
    ){
-        return cloudRecordService.queryTask(app, stream, callId, taskId, mediaServerId, isEnd);
+       if (ObjectUtils.isEmpty(mediaServerId)) {
+           mediaServerId = null;
+       }
+       return cloudRecordService.queryTask(app, stream, callId, taskId, mediaServerId, isEnd);
    }

    @ResponseBody