diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
index 6eeac51..5c7e537 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
@@ -126,9 +126,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.lastUserName != null and query.lastUserName != ''">and bul.nick_name like concat('%', #{query.lastUserName}, '%')</if>
         <if test="query.lastUserPhone != null and query.lastUserPhone != ''">and bul.user_name like concat('%', #{query.lastUserPhone}, '%')</if>
         <if test="query.mchName != null and query.mchName != ''">and mch.nick_name like concat('%', #{query.mchName}, '%')</if>
-        <if test="query.modelName != null and query.modelName != ''">and bm.name like concat('%', #{query.modelName}, '%')</if>        
+        <if test="query.modelName != null and query.modelName != ''">and bm.name like concat('%', #{query.modelName}, '%')</if>
         <if test="query.suitId != null">
-            and find_in_set(#{query.suitId}, bm.suit_ids)
+            and bm.id in (
+                select bms.model_id from bst_model_suit bms where bms.suit_id = #{query.suitId}
+            )
         </if>
         <if test="query.ids != null and query.ids.size() > 0">
             and bd.id in
@@ -453,11 +455,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         limit 1
     </select>
 
-    <!-- selectMacSnList --> 
+    <!-- selectMacSnList -->
 
     <select id="selectMacSnList" resultType="DeviceMacSnVO">
-        select 
-            bd.mac, 
+        select
+            bd.mac,
             bd.sn
         from bst_device bd
         <where>