diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/LocaleConstant.kt b/app/src/main/java/com/casic/common/detector/gd/utils/LocaleConstant.kt
index 8ac5f76..9b5582c 100644
--- a/app/src/main/java/com/casic/common/detector/gd/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/utils/LocaleConstant.kt
@@ -73,7 +73,8 @@
             SPINNER_ARRAY[6] -> "updateTime"
             else -> "remark"
         }
-        val queryBuilder = StringBuilder("SELECT * FROM marker_detail WHERE $columnName = ?")
-        return SimpleSQLiteQuery(queryBuilder.toString(), arrayOf(value))
+        val queryBuilder = StringBuilder("SELECT * FROM marker_detail WHERE $columnName LIKE ?")
+        val valueWithWildcard = "%$value%"
+        return SimpleSQLiteQuery(queryBuilder.toString(), arrayOf(valueWithWildcard))
     }
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/common/detector/gd/utils/LocaleConstant.kt b/app/src/main/java/com/casic/common/detector/gd/utils/LocaleConstant.kt
index 8ac5f76..9b5582c 100644
--- a/app/src/main/java/com/casic/common/detector/gd/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/utils/LocaleConstant.kt
@@ -73,7 +73,8 @@
             SPINNER_ARRAY[6] -> "updateTime"
             else -> "remark"
         }
-        val queryBuilder = StringBuilder("SELECT * FROM marker_detail WHERE $columnName = ?")
-        return SimpleSQLiteQuery(queryBuilder.toString(), arrayOf(value))
+        val queryBuilder = StringBuilder("SELECT * FROM marker_detail WHERE $columnName LIKE ?")
+        val valueWithWildcard = "%$value%"
+        return SimpleSQLiteQuery(queryBuilder.toString(), arrayOf(valueWithWildcard))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt
index e99a083..0bc8b5d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt
@@ -18,7 +18,6 @@
 import com.amap.api.maps.AMap.OnMapLongClickListener
 import com.amap.api.maps.AMapOptions
 import com.amap.api.maps.CameraUpdateFactory
-import com.amap.api.maps.CoordinateConverter
 import com.amap.api.maps.model.BitmapDescriptorFactory
 import com.amap.api.maps.model.CameraPosition
 import com.amap.api.maps.model.LatLng
@@ -196,27 +195,8 @@
                         val buildQuery = LocaleConstant.buildQuery(selectedItem, value)
                         markerBeanDao.loadMarkersByCondition(buildQuery).run {
                             if (isNotEmpty()) {
-                                val latitudeList = ArrayList<Double>()
-                                val longitudeList = ArrayList<Double>()
-
-                                val latitude = first().lat
-                                val longitude = first().lng
-                                if (latitude.isNotBlank() && longitude.isNotBlank()) {
-                                    if (CoordinateConverter.isAMapDataAvailable(
-                                            latitude.toDouble(), longitude.toDouble()
-                                        )
-                                    ) {
-                                        //分别缓存经、纬度
-                                        latitudeList.add(latitude.toDouble())
-                                        longitudeList.add(longitude.toDouble())
-                                    }
-                                }
-
-                                if (latitudeList.isNotEmpty() && longitudeList.isNotEmpty()) {
-                                    //移动地图到所有labelBeans的第一个点
-                                    val target = LatLng(latitudeList.first(), longitudeList.first())
-                                    aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(target, 16f))
-                                }
+                                aMap.clear()
+                                renderMarkers(this)
                             } else {
                                 "无法查到相关信息，请检查您的查询条件".show(context)
                             }
@@ -732,14 +712,12 @@
             return
         }
         val first = markers.first()
-        if (first.lat.isEmpty() || first.lng.isEmpty()) {
-            return
+        if (first.lat.isNotBlank() && first.lng.isNotBlank()) {
+            val defaultLatLng = LatLng(first.lat.toDouble(), first.lng.toDouble())
+            val cameraPosition = CameraPosition(defaultLatLng, 14f, 0f, 0f)
+            val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
+            aMap.animateCamera(cameraUpdate, 1500, null)
         }
-        val defaultLatLng = LatLng(first.lat.toDouble(), first.lng.toDouble())
-        //移动到指定经纬度
-        val cameraPosition = CameraPosition(defaultLatLng, 14f, 0f, 0f)
-        val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
-        aMap.animateCamera(cameraUpdate, 1500, null)
         markers.forEach { marker ->
             val latitude = marker.lat.toString().toDouble()
             val longitude = marker.lng.toString().toDouble()