From ab74d1cff90cc563e0eca8deb8f154d84eb51908 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期三, 14 九月 2022 20:51:21 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' --- src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java index 0e656cf..675a8bc 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java @@ -77,7 +77,7 @@ "1=1 " + " <if test='query != null'> AND (st.app LIKE '%${query}%' OR st.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%')</if> " + " <if test='pushing == true' > AND (gs.gbId is null OR st.pushIng=1)</if>" + - " <if test='pushing == false' > AND (gs.pushIng is null OR st.pushIng=0) </if>" + + " <if test='pushing == false' > AND (st.pushIng is null OR st.pushIng=0) </if>" + " <if test='mediaServerId != null' > AND st.mediaServerId=#{mediaServerId} </if>" + "order by st.createTime desc" + " </script>"}) -- Gitblit v1.8.0