diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonGbChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonGbChannelMapper.java
index 9c0741929..230340984 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonGbChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonGbChannelMapper.java
@@ -332,14 +332,14 @@ public interface CommonGbChannelMapper {
             @Param("groupDeviceIdForNew") String groupDeviceIdForNew);
 
     @Select("<script> "+
-            "select * from wvp_common_gb_channel where common_gb_civilCode = '#{regionDeviceId}'" +
+            "select * from wvp_common_gb_channel where common_gb_civilCode = #{regionDeviceId}" +
             "<if test='query != null'> and ( common_gb_device_id LIKE concat('%',#{query},'%') or common_gb_name LIKE concat('%',#{query},'%') )  </if>" +
             "</script>")
     List<CommonGbChannel> getChannelsInRegion(@Param("regionDeviceId") String regionDeviceId,
                                               @Param("query") String query);
 
     @Select("<script> "+
-            "select * from wvp_common_gb_channel where common_gb_business_group_id = '#{groupDeviceId}'" +
+            "select * from wvp_common_gb_channel where common_gb_business_group_id = #{groupDeviceId}" +
             "<if test='query != null'> and ( common_gb_device_id LIKE concat('%',#{query},'%') or common_gb_name LIKE concat('%',#{query},'%') )  </if>" +
             "</script>")
     List<CommonGbChannel> queryChannelListInGroup(@Param("groupDeviceId") String groupDeviceId,
@@ -349,5 +349,5 @@ public interface CommonGbChannelMapper {
             "select * from wvp_common_gb_channel where 1=1 " +
             "<if test='query != null'> and ( common_gb_device_id LIKE concat('%',#{query},'%') or common_gb_name LIKE concat('%',#{query},'%') )  </if>" +
             "</script>")
-    List<CommonGbChannel> query(String query);
+    List<CommonGbChannel> query(@Param("query") String query);
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java
index 0e0475f45..43848f9df 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/channel/CommonChannelController.java
@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +56,10 @@ public class CommonChannelController {
             @RequestParam(required = true) int page,
             @RequestParam(required = true) int count ){
 
+        if (ObjectUtils.isEmpty(query)) {
+            query = null;
+        }
+        assert !ObjectUtils.isEmpty(groupDeviceId);
         return commonGbChannelService.queryChannelListInGroup(groupDeviceId, query, page, count);
     }