#FIX

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -263,6 +263,7 @@
         from device_info
 
         <where>
+            active_state='1'
             <if test="query.mercId != null">
                 and merc_id = #{query.mercId}
             </if>