Merge branch 'master' into test6.9.1

mali
Commit 7562d7dd195559117a7254a217359fde6e808da6 2 parents 572b1149 c6dd148a
Showing 1 changed file with 1 additions and 1 deletions
order/src/main/java/com/yoho/ufo/order/service/impl/UfoLiveService.java
--- a/order/src/main/java/com/yoho/ufo/order/service/impl/UfoLiveService.java
View file @7562d7d
+++ b/order/src/main/java/com/yoho/ufo/order/service/impl/UfoLiveService.java
View file @7562d7d
@@ -264,7 +264,7 @@ public class UfoLiveService  {
 
 
     public int updateVideoUrl(Integer id, String vedioUrl) {
-         return qiniuLiveRecordMapper.updateVideoUrl(id, vedioUrl, DateUtil.getCurrentTimeSeconds());
+         return qiniuLiveRecordMapper.updateVideoUrl(id, null == vedioUrl ? "" : vedioUrl, DateUtil.getCurrentTimeSeconds());
     }
 
     public List<QiniuLiveRecord> queryVideoInfo(Integer startTime, Integer endTime) {