diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index cf0f82a..ca60fdf 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -1,6 +1,7 @@
 package com.casic.xz.meterage.view.search
 
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -109,20 +110,26 @@
     }
 
     private fun getCustomerList() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             customerViewModel.getCustomerList(
-                "", param, "", "", pageIndex
+                "", "", param, "", pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                customerViewModel.getCustomerList(
-                    "", "", param, "", pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 customerViewModel.getCustomerList(
                     "", param, "", "", pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    customerViewModel.getCustomerList(
+                        "", "", param, "", pageIndex
+                    )
+                } else {
+                    customerViewModel.getCustomerList(
+                        "", param, "", "", pageIndex
+                    )
+                }
             }
         }
     }

diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index cf0f82a..ca60fdf 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -1,6 +1,7 @@
 package com.casic.xz.meterage.view.search
 
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -109,20 +110,26 @@
     }
 
     private fun getCustomerList() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             customerViewModel.getCustomerList(
-                "", param, "", "", pageIndex
+                "", "", param, "", pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                customerViewModel.getCustomerList(
-                    "", "", param, "", pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 customerViewModel.getCustomerList(
                     "", param, "", "", pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    customerViewModel.getCustomerList(
+                        "", "", param, "", pageIndex
+                    )
+                } else {
+                    customerViewModel.getCustomerList(
+                        "", param, "", "", pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 470a6a6..d4c2893 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.extensions.formatToYearMonthDay
@@ -111,23 +112,30 @@
     }
 
     private fun getEntrustListByPage() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             entrustViewModel.getEntrustList(
-                param, "", "", "", "", "", "",
+                "", "", "", param, "", "", "",
                 "", arrayOf(), pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                entrustViewModel.getEntrustList(
-                    "", "", "", param, "", "", "",
-                    "", arrayOf(), pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 entrustViewModel.getEntrustList(
                     param, "", "", "", "", "", "",
                     "", arrayOf(), pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    entrustViewModel.getEntrustList(
+                        "", "", "", param, "", "", "",
+                        "", arrayOf(), pageIndex
+                    )
+                } else {
+                    entrustViewModel.getEntrustList(
+                        param, "", "", "", "", "", "",
+                        "", arrayOf(), pageIndex
+                    )
+                }
             }
         }
     }

diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index cf0f82a..ca60fdf 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -1,6 +1,7 @@
 package com.casic.xz.meterage.view.search
 
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -109,20 +110,26 @@
     }
 
     private fun getCustomerList() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             customerViewModel.getCustomerList(
-                "", param, "", "", pageIndex
+                "", "", param, "", pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                customerViewModel.getCustomerList(
-                    "", "", param, "", pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 customerViewModel.getCustomerList(
                     "", param, "", "", pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    customerViewModel.getCustomerList(
+                        "", "", param, "", pageIndex
+                    )
+                } else {
+                    customerViewModel.getCustomerList(
+                        "", param, "", "", pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 470a6a6..d4c2893 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.extensions.formatToYearMonthDay
@@ -111,23 +112,30 @@
     }
 
     private fun getEntrustListByPage() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             entrustViewModel.getEntrustList(
-                param, "", "", "", "", "", "",
+                "", "", "", param, "", "", "",
                 "", arrayOf(), pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                entrustViewModel.getEntrustList(
-                    "", "", "", param, "", "", "",
-                    "", arrayOf(), pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 entrustViewModel.getEntrustList(
                     param, "", "", "", "", "", "",
                     "", arrayOf(), pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    entrustViewModel.getEntrustList(
+                        "", "", "", param, "", "", "",
+                        "", arrayOf(), pageIndex
+                    )
+                } else {
+                    entrustViewModel.getEntrustList(
+                        param, "", "", "", "", "", "",
+                        "", arrayOf(), pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index d103c45..a70c765 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -113,29 +114,38 @@
     }
 
     private fun getEquipmentListByPage() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             equipmentViewModel.getEquipmentList(
-                "", param, "", "",
+                param, "", "", "",
                 "", "1", "", "",
                 "", "", "", "",
                 "", "", arrayOf(), pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                equipmentViewModel.getEquipmentList(
-                    param, "", "", "",
-                    "", "1", "", "",
-                    "", "", "", "",
-                    "", "", arrayOf(), pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 equipmentViewModel.getEquipmentList(
                     "", param, "", "",
                     "", "1", "", "",
                     "", "", "", "",
                     "", "", arrayOf(), pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    equipmentViewModel.getEquipmentList(
+                        param, "", "", "",
+                        "", "1", "", "",
+                        "", "", "", "",
+                        "", "", arrayOf(), pageIndex
+                    )
+                } else {
+                    equipmentViewModel.getEquipmentList(
+                        "", param, "", "",
+                        "", "1", "", "",
+                        "", "", "", "",
+                        "", "", arrayOf(), pageIndex
+                    )
+                }
             }
         }
     }

diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index cf0f82a..ca60fdf 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -1,6 +1,7 @@
 package com.casic.xz.meterage.view.search
 
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -109,20 +110,26 @@
     }
 
     private fun getCustomerList() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             customerViewModel.getCustomerList(
-                "", param, "", "", pageIndex
+                "", "", param, "", pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                customerViewModel.getCustomerList(
-                    "", "", param, "", pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 customerViewModel.getCustomerList(
                     "", param, "", "", pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    customerViewModel.getCustomerList(
+                        "", "", param, "", pageIndex
+                    )
+                } else {
+                    customerViewModel.getCustomerList(
+                        "", param, "", "", pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 470a6a6..d4c2893 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.extensions.formatToYearMonthDay
@@ -111,23 +112,30 @@
     }
 
     private fun getEntrustListByPage() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             entrustViewModel.getEntrustList(
-                param, "", "", "", "", "", "",
+                "", "", "", param, "", "", "",
                 "", arrayOf(), pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                entrustViewModel.getEntrustList(
-                    "", "", "", param, "", "", "",
-                    "", arrayOf(), pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 entrustViewModel.getEntrustList(
                     param, "", "", "", "", "", "",
                     "", arrayOf(), pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    entrustViewModel.getEntrustList(
+                        "", "", "", param, "", "", "",
+                        "", arrayOf(), pageIndex
+                    )
+                } else {
+                    entrustViewModel.getEntrustList(
+                        param, "", "", "", "", "", "",
+                        "", arrayOf(), pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index d103c45..a70c765 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -113,29 +114,38 @@
     }
 
     private fun getEquipmentListByPage() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             equipmentViewModel.getEquipmentList(
-                "", param, "", "",
+                param, "", "", "",
                 "", "1", "", "",
                 "", "", "", "",
                 "", "", arrayOf(), pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                equipmentViewModel.getEquipmentList(
-                    param, "", "", "",
-                    "", "1", "", "",
-                    "", "", "", "",
-                    "", "", arrayOf(), pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 equipmentViewModel.getEquipmentList(
                     "", param, "", "",
                     "", "1", "", "",
                     "", "", "", "",
                     "", "", arrayOf(), pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    equipmentViewModel.getEquipmentList(
+                        param, "", "", "",
+                        "", "1", "", "",
+                        "", "", "", "",
+                        "", "", arrayOf(), pageIndex
+                    )
+                } else {
+                    equipmentViewModel.getEquipmentList(
+                        "", param, "", "",
+                        "", "1", "", "",
+                        "", "", "", "",
+                        "", "", arrayOf(), pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index 3f60353..5026470 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -92,20 +93,26 @@
     }
 
     private fun getGlobalSearchResult() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             searchViewModel.getGlobalSearchResult(
-                "", param, "", "", "", pageIndex
+                "", "", param, "", "", pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                searchViewModel.getGlobalSearchResult(
-                    "", "", param, "", "", pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 searchViewModel.getGlobalSearchResult(
                     "", param, "", "", "", pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    searchViewModel.getGlobalSearchResult(
+                        "", "", param, "", "", pageIndex
+                    )
+                } else {
+                    searchViewModel.getGlobalSearchResult(
+                        "", param, "", "", "", pageIndex
+                    )
+                }
             }
         }
     }

diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index cf0f82a..ca60fdf 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -1,6 +1,7 @@
 package com.casic.xz.meterage.view.search
 
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -109,20 +110,26 @@
     }
 
     private fun getCustomerList() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             customerViewModel.getCustomerList(
-                "", param, "", "", pageIndex
+                "", "", param, "", pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                customerViewModel.getCustomerList(
-                    "", "", param, "", pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 customerViewModel.getCustomerList(
                     "", param, "", "", pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    customerViewModel.getCustomerList(
+                        "", "", param, "", pageIndex
+                    )
+                } else {
+                    customerViewModel.getCustomerList(
+                        "", param, "", "", pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 470a6a6..d4c2893 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.extensions.formatToYearMonthDay
@@ -111,23 +112,30 @@
     }
 
     private fun getEntrustListByPage() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             entrustViewModel.getEntrustList(
-                param, "", "", "", "", "", "",
+                "", "", "", param, "", "", "",
                 "", arrayOf(), pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                entrustViewModel.getEntrustList(
-                    "", "", "", param, "", "", "",
-                    "", arrayOf(), pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 entrustViewModel.getEntrustList(
                     param, "", "", "", "", "", "",
                     "", arrayOf(), pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    entrustViewModel.getEntrustList(
+                        "", "", "", param, "", "", "",
+                        "", arrayOf(), pageIndex
+                    )
+                } else {
+                    entrustViewModel.getEntrustList(
+                        param, "", "", "", "", "", "",
+                        "", arrayOf(), pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index d103c45..a70c765 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -113,29 +114,38 @@
     }
 
     private fun getEquipmentListByPage() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             equipmentViewModel.getEquipmentList(
-                "", param, "", "",
+                param, "", "", "",
                 "", "1", "", "",
                 "", "", "", "",
                 "", "", arrayOf(), pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                equipmentViewModel.getEquipmentList(
-                    param, "", "", "",
-                    "", "1", "", "",
-                    "", "", "", "",
-                    "", "", arrayOf(), pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 equipmentViewModel.getEquipmentList(
                     "", param, "", "",
                     "", "1", "", "",
                     "", "", "", "",
                     "", "", arrayOf(), pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    equipmentViewModel.getEquipmentList(
+                        param, "", "", "",
+                        "", "1", "", "",
+                        "", "", "", "",
+                        "", "", arrayOf(), pageIndex
+                    )
+                } else {
+                    equipmentViewModel.getEquipmentList(
+                        "", param, "", "",
+                        "", "1", "", "",
+                        "", "", "", "",
+                        "", "", arrayOf(), pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index 3f60353..5026470 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -92,20 +93,26 @@
     }
 
     private fun getGlobalSearchResult() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             searchViewModel.getGlobalSearchResult(
-                "", param, "", "", "", pageIndex
+                "", "", param, "", "", pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                searchViewModel.getGlobalSearchResult(
-                    "", "", param, "", "", pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 searchViewModel.getGlobalSearchResult(
                     "", param, "", "", "", pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    searchViewModel.getGlobalSearchResult(
+                        "", "", param, "", "", pageIndex
+                    )
+                } else {
+                    searchViewModel.getGlobalSearchResult(
+                        "", param, "", "", "", pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index de5aa99..a9ef440 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -117,9 +117,8 @@
 
     private fun getMeterageTrainList() {
         if (param.isDigitsOnly()) {
-            //根据部门查
             meterageTrainViewModel.getMeterageTrainList(
-                "", "", param, "", "", "",
+                "", "", "", "", param, "",
                 "", "", "", "jlglpxjhsp", arrayOf(),
                 pageIndex
             )

diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index cf0f82a..ca60fdf 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -1,6 +1,7 @@
 package com.casic.xz.meterage.view.search
 
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -109,20 +110,26 @@
     }
 
     private fun getCustomerList() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             customerViewModel.getCustomerList(
-                "", param, "", "", pageIndex
+                "", "", param, "", pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                customerViewModel.getCustomerList(
-                    "", "", param, "", pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 customerViewModel.getCustomerList(
                     "", param, "", "", pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    customerViewModel.getCustomerList(
+                        "", "", param, "", pageIndex
+                    )
+                } else {
+                    customerViewModel.getCustomerList(
+                        "", param, "", "", pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 470a6a6..d4c2893 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import com.casic.xz.meterage.R
 import com.casic.xz.meterage.extensions.formatToYearMonthDay
@@ -111,23 +112,30 @@
     }
 
     private fun getEntrustListByPage() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             entrustViewModel.getEntrustList(
-                param, "", "", "", "", "", "",
+                "", "", "", param, "", "", "",
                 "", arrayOf(), pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                entrustViewModel.getEntrustList(
-                    "", "", "", param, "", "", "",
-                    "", arrayOf(), pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 entrustViewModel.getEntrustList(
                     param, "", "", "", "", "", "",
                     "", arrayOf(), pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    entrustViewModel.getEntrustList(
+                        "", "", "", param, "", "", "",
+                        "", arrayOf(), pageIndex
+                    )
+                } else {
+                    entrustViewModel.getEntrustList(
+                        param, "", "", "", "", "", "",
+                        "", arrayOf(), pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index d103c45..a70c765 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -113,29 +114,38 @@
     }
 
     private fun getEquipmentListByPage() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             equipmentViewModel.getEquipmentList(
-                "", param, "", "",
+                param, "", "", "",
                 "", "1", "", "",
                 "", "", "", "",
                 "", "", arrayOf(), pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                equipmentViewModel.getEquipmentList(
-                    param, "", "", "",
-                    "", "1", "", "",
-                    "", "", "", "",
-                    "", "", arrayOf(), pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 equipmentViewModel.getEquipmentList(
                     "", param, "", "",
                     "", "1", "", "",
                     "", "", "", "",
                     "", "", arrayOf(), pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    equipmentViewModel.getEquipmentList(
+                        param, "", "", "",
+                        "", "1", "", "",
+                        "", "", "", "",
+                        "", "", arrayOf(), pageIndex
+                    )
+                } else {
+                    equipmentViewModel.getEquipmentList(
+                        "", param, "", "",
+                        "", "1", "", "",
+                        "", "", "", "",
+                        "", "", arrayOf(), pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index 3f60353..5026470 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -92,20 +93,26 @@
     }
 
     private fun getGlobalSearchResult() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             searchViewModel.getGlobalSearchResult(
-                "", param, "", "", "", pageIndex
+                "", "", param, "", "", pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                searchViewModel.getGlobalSearchResult(
-                    "", "", param, "", "", pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 searchViewModel.getGlobalSearchResult(
                     "", param, "", "", "", pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    searchViewModel.getGlobalSearchResult(
+                        "", "", param, "", "", pageIndex
+                    )
+                } else {
+                    searchViewModel.getGlobalSearchResult(
+                        "", param, "", "", "", pageIndex
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index de5aa99..a9ef440 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -117,9 +117,8 @@
 
     private fun getMeterageTrainList() {
         if (param.isDigitsOnly()) {
-            //根据部门查
             meterageTrainViewModel.getMeterageTrainList(
-                "", "", param, "", "", "",
+                "", "", "", "", param, "",
                 "", "", "", "jlglpxjhsp", arrayOf(),
                 pageIndex
             )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index e90f80e..aea1397 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -2,6 +2,7 @@
 
 import android.content.Context
 import android.os.Handler
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.xz.meterage.R
@@ -113,23 +114,30 @@
     }
 
     private fun getStandardDeviceByPage() {
-        if (param.length < 4) {
-            //输入参数长度小于4，默认查名称
+        if (param.isDigitsOnly()) {
             equipmentViewModel.getStandardDeviceList(
-                "", param, "", "", "",
+                param, "", "", "", "",
                 "", "", pageIndex
             )
         } else {
-            if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
-                equipmentViewModel.getStandardDeviceList(
-                    param, "", "", "", "",
-                    "", "", pageIndex
-                )
-            } else {
+            if (param.length < 4) {
+                //输入参数长度小于4，默认查名称
                 equipmentViewModel.getStandardDeviceList(
                     "", param, "", "", "",
                     "", "", pageIndex
                 )
+            } else {
+                if (AppMemoryCache.prefixCode.contains(param.substring(0, 4))) {
+                    equipmentViewModel.getStandardDeviceList(
+                        param, "", "", "", "",
+                        "", "", pageIndex
+                    )
+                } else {
+                    equipmentViewModel.getStandardDeviceList(
+                        "", param, "", "", "",
+                        "", "", pageIndex
+                    )
+                }
             }
         }
     }