From fc45913412a310d2855dcd80dfc560acf965559d Mon Sep 17 00:00:00 2001 From: Administrator <1144154118@qq.com> Date: 星期五, 18 八月 2023 15:41:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java index 9852e1d..5e61e05 100644 --- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java +++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java @@ -264,7 +264,7 @@ String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name; info.setRtspUrl(rtspUrl); Source source = item.getSource(); - if (source.getId().equals("")) { + if (source==null||source.getId().equals("")) { //浼氳瘽ID info.setId("0"); //涓婅娴侀噺 -- Gitblit v1.9.3