diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml
index c7c669a..9f5ca65 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml
@@ -68,9 +68,11 @@
         from
             cs_group
         where
-            data_set_id = #{id} and is_show = 1 and group_name like concat('%',#{searchValue},'%')
-        order by
-            sort
+            data_set_id = #{id} and is_show = 1
+        <if test="searchValue != null and searchValue !=''">
+            and group_name like concat('%',#{searchValue},'%')
+        </if>
+        order by sort
     </select>
 
 </mapper>
\ No newline at end of file