Pre Merge pull request !36 from 阿斌/N/A

src/main/java/com/genersoft/iot/vmp/gb28181/dao/GroupMapper.java

@@ -156,8 +156,7 @@ public interface GroupMapper {
             " wcg.name as gb_name," +
             " wcg.business_group as gb_business_group_id," +
             " 1 as gb_parental," +
-            " wcg.parent_device_id as gb_parent_id," +
-            " wcg.civil_code as gb_civil_code" +
+            " wcg.parent_device_id as gb_parent_id" +
             " from wvp_common_group wcg" +
             " left join wvp_platform_group wpg on wpg.group_id = wcg.id" +
             " where wpg.platform_id = #{platformId} " +

src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java

@@ -53,8 +53,8 @@ public interface StreamPushMapper {
             " 1=1 " +
             " <if test='query != null'> AND (st.app LIKE concat('%',#{query},'%') escape '/' OR st.stream LIKE concat('%',#{query},'%') escape '/' " +
             " OR wdc.gb_device_id LIKE concat('%',#{query},'%') escape '/' OR wdc.gb_name LIKE concat('%',#{query},'%') escape '/')</if> " +
-            " <if test='pushing == true' > AND st.pushing=true</if>" +
-            " <if test='pushing == false' > AND st.pushing=false </if>" +
+            " <if test='pushing == true' > AND st.pushing=1</if>" +
+            " <if test='pushing == false' > AND st.pushing=0 </if>" +
             " <if test='mediaServerId != null' > AND st.media_server_id=#{mediaServerId} </if>" +
             " order by st.create_time desc" +
             " </script>"})