diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
index cdffb37..2f0d714 100644
--- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
+++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
@@ -195,15 +195,12 @@
 }
 
 fun String.toChineseGrade(): String {
-    if (this.isBlank() || this.isEmpty()) {
-        return "EE"
-    }
     return when (this) {
         "0" -> "A"
         "1" -> "B"
         "2" -> "C"
         "3" -> "D"
-        else -> "EE"
+        else -> "E"
     }
 }
 

diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
index cdffb37..2f0d714 100644
--- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
+++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
@@ -195,15 +195,12 @@
 }
 
 fun String.toChineseGrade(): String {
-    if (this.isBlank() || this.isEmpty()) {
-        return "EE"
-    }
     return when (this) {
         "0" -> "A"
         "1" -> "B"
         "2" -> "C"
         "3" -> "D"
-        else -> "EE"
+        else -> "E"
     }
 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
index e7b2754..56161df 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
@@ -37,13 +37,19 @@
                             item.name
                         }
 
+                        val job = if (item.job.isNullOrBlank()) {
+                            "无"
+                        } else {
+                            item.job
+                        }
+
                         viewHolder.setBackgroundColor(R.id.nameTagView, color[0])
                             .setTextColor(R.id.nameTagView, color[1])
                             .setText(R.id.nameTagView, name.last().toString())
                             .setText(R.id.userNameView, name)
                             .setText(R.id.userPhoneView, item.phone)
                             .setText(R.id.userDeptView, "部门：${item.department}")
-                            .setText(R.id.userJobView, item.job)
+                            .setText(R.id.userJobView, job)
                     }
                 }
             customPersonRecyclerView.addItemDecoration(

diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
index cdffb37..2f0d714 100644
--- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
+++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
@@ -195,15 +195,12 @@
 }
 
 fun String.toChineseGrade(): String {
-    if (this.isBlank() || this.isEmpty()) {
-        return "EE"
-    }
     return when (this) {
         "0" -> "A"
         "1" -> "B"
         "2" -> "C"
         "3" -> "D"
-        else -> "EE"
+        else -> "E"
     }
 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
index e7b2754..56161df 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
@@ -37,13 +37,19 @@
                             item.name
                         }
 
+                        val job = if (item.job.isNullOrBlank()) {
+                            "无"
+                        } else {
+                            item.job
+                        }
+
                         viewHolder.setBackgroundColor(R.id.nameTagView, color[0])
                             .setTextColor(R.id.nameTagView, color[1])
                             .setText(R.id.nameTagView, name.last().toString())
                             .setText(R.id.userNameView, name)
                             .setText(R.id.userPhoneView, item.phone)
                             .setText(R.id.userDeptView, "部门：${item.department}")
-                            .setText(R.id.userJobView, item.job)
+                            .setText(R.id.userJobView, job)
                     }
                 }
             customPersonRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index acf463d..294c17a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -154,30 +154,27 @@
                                 else -> R.color.gray.convertColor(context)
                             }
 
-                            val companySize =
-                                if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) {
-                                    "规模未知"
-                                } else {
-                                    item.companySizeName
-                                }
+                            val companySize = if (item.companySizeName.isNullOrEmpty()) {
+                                "规模未知"
+                            } else {
+                                item.companySizeName
+                            }
 
-                            val scaleColor =
-                                if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) {
-                                    R.color.mainBackground.convertColor(context)
-                                } else {
-                                    R.color.themeColor.convertColor(context)
-                                }
+                            val scaleColor = if (item.companySizeName.isNullOrEmpty()) {
+                                R.color.mainBackground.convertColor(context)
+                            } else {
+                                R.color.themeColor.convertColor(context)
+                            }
 
-                            val scaleTextColor =
-                                if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) {
-                                    R.color.gray.convertColor(context)
-                                } else {
-                                    R.color.white.convertColor(context)
-                                }
+                            val scaleTextColor = if (item.companySizeName.isNullOrEmpty()) {
+                                R.color.gray.convertColor(context)
+                            } else {
+                                R.color.white.convertColor(context)
+                            }
 
-                            viewHolder.setBackgroundColor(R.id.agreementLevelView, color)
+                            viewHolder.setText(R.id.agreementLevelView, item.grade.toChineseGrade())
                                 .setTextColor(R.id.agreementLevelView, textColor)
-                                .setText(R.id.agreementLevelView, item.grade.toChineseGrade())
+                                .setBackgroundColor(R.id.agreementLevelView, color)
                                 .setText(R.id.customerNameView, item.customerName)
                                 .setText(R.id.scaleView, companySize)
                                 .setTextColor(R.id.scaleView, scaleTextColor)

diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
index cdffb37..2f0d714 100644
--- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
+++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
@@ -195,15 +195,12 @@
 }
 
 fun String.toChineseGrade(): String {
-    if (this.isBlank() || this.isEmpty()) {
-        return "EE"
-    }
     return when (this) {
         "0" -> "A"
         "1" -> "B"
         "2" -> "C"
         "3" -> "D"
-        else -> "EE"
+        else -> "E"
     }
 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
index e7b2754..56161df 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
@@ -37,13 +37,19 @@
                             item.name
                         }
 
+                        val job = if (item.job.isNullOrBlank()) {
+                            "无"
+                        } else {
+                            item.job
+                        }
+
                         viewHolder.setBackgroundColor(R.id.nameTagView, color[0])
                             .setTextColor(R.id.nameTagView, color[1])
                             .setText(R.id.nameTagView, name.last().toString())
                             .setText(R.id.userNameView, name)
                             .setText(R.id.userPhoneView, item.phone)
                             .setText(R.id.userDeptView, "部门：${item.department}")
-                            .setText(R.id.userJobView, item.job)
+                            .setText(R.id.userJobView, job)
                     }
                 }
             customPersonRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index acf463d..294c17a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -154,30 +154,27 @@
                                 else -> R.color.gray.convertColor(context)
                             }
 
-                            val companySize =
-                                if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) {
-                                    "规模未知"
-                                } else {
-                                    item.companySizeName
-                                }
+                            val companySize = if (item.companySizeName.isNullOrEmpty()) {
+                                "规模未知"
+                            } else {
+                                item.companySizeName
+                            }
 
-                            val scaleColor =
-                                if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) {
-                                    R.color.mainBackground.convertColor(context)
-                                } else {
-                                    R.color.themeColor.convertColor(context)
-                                }
+                            val scaleColor = if (item.companySizeName.isNullOrEmpty()) {
+                                R.color.mainBackground.convertColor(context)
+                            } else {
+                                R.color.themeColor.convertColor(context)
+                            }
 
-                            val scaleTextColor =
-                                if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) {
-                                    R.color.gray.convertColor(context)
-                                } else {
-                                    R.color.white.convertColor(context)
-                                }
+                            val scaleTextColor = if (item.companySizeName.isNullOrEmpty()) {
+                                R.color.gray.convertColor(context)
+                            } else {
+                                R.color.white.convertColor(context)
+                            }
 
-                            viewHolder.setBackgroundColor(R.id.agreementLevelView, color)
+                            viewHolder.setText(R.id.agreementLevelView, item.grade.toChineseGrade())
                                 .setTextColor(R.id.agreementLevelView, textColor)
-                                .setText(R.id.agreementLevelView, item.grade.toChineseGrade())
+                                .setBackgroundColor(R.id.agreementLevelView, color)
                                 .setText(R.id.customerNameView, item.customerName)
                                 .setText(R.id.scaleView, companySize)
                                 .setTextColor(R.id.scaleView, scaleTextColor)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 22ddd2c..e730b45 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -149,6 +149,7 @@
                             viewHolder: ViewHolder, position: Int,
                             item: CustomerListModel.DataModel.RowsModel
                         ) {
+
                             val color = when (item.grade) {
                                 "0" -> R.color.color_A.convertColor(context)
                                 "1" -> R.color.color_B.convertColor(context)
@@ -156,7 +157,6 @@
                                 "3" -> R.color.color_D.convertColor(context)
                                 else -> R.color.mainBackground.convertColor(context)
                             }
-                            viewHolder.setBackgroundColor(R.id.agreementLevelView, color)
 
                             val textColor = when (item.grade) {
                                 "0" -> R.color.textColor_A.convertColor(context)
@@ -165,11 +165,13 @@
                                 "3" -> R.color.textColor_D.convertColor(context)
                                 else -> R.color.gray.convertColor(context)
                             }
-                            viewHolder.setTextColor(R.id.agreementLevelView, textColor)
-                                .setText(R.id.agreementLevelView, item.grade.toChineseGrade())
+
+                            viewHolder.setText(R.id.agreementLevelView, item.grade.toChineseGrade())
+                                .setTextColor(R.id.agreementLevelView, textColor)
+                                .setBackgroundColor(R.id.agreementLevelView, color)
                                 .setText(R.id.customerNameView, item.customerName)
-                                .setText(R.id.overallView, "公司规模：${item.evaluationName}")
-                                .setText(R.id.fullAddressView, "公司地址：${item.fullAddress}")
+                                .setText(R.id.overallView, "分类：${item.evaluationName}")
+                                .setText(R.id.fullAddressView, "地址：${item.fullAddress}")
                         }
                     }
                     customerRecyclerView.addItemDecoration(

diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
index cdffb37..2f0d714 100644
--- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
+++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt
@@ -195,15 +195,12 @@
 }
 
 fun String.toChineseGrade(): String {
-    if (this.isBlank() || this.isEmpty()) {
-        return "EE"
-    }
     return when (this) {
         "0" -> "A"
         "1" -> "B"
         "2" -> "C"
         "3" -> "D"
-        else -> "EE"
+        else -> "E"
     }
 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
index e7b2754..56161df 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt
@@ -37,13 +37,19 @@
                             item.name
                         }
 
+                        val job = if (item.job.isNullOrBlank()) {
+                            "无"
+                        } else {
+                            item.job
+                        }
+
                         viewHolder.setBackgroundColor(R.id.nameTagView, color[0])
                             .setTextColor(R.id.nameTagView, color[1])
                             .setText(R.id.nameTagView, name.last().toString())
                             .setText(R.id.userNameView, name)
                             .setText(R.id.userPhoneView, item.phone)
                             .setText(R.id.userDeptView, "部门：${item.department}")
-                            .setText(R.id.userJobView, item.job)
+                            .setText(R.id.userJobView, job)
                     }
                 }
             customPersonRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index acf463d..294c17a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -154,30 +154,27 @@
                                 else -> R.color.gray.convertColor(context)
                             }
 
-                            val companySize =
-                                if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) {
-                                    "规模未知"
-                                } else {
-                                    item.companySizeName
-                                }
+                            val companySize = if (item.companySizeName.isNullOrEmpty()) {
+                                "规模未知"
+                            } else {
+                                item.companySizeName
+                            }
 
-                            val scaleColor =
-                                if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) {
-                                    R.color.mainBackground.convertColor(context)
-                                } else {
-                                    R.color.themeColor.convertColor(context)
-                                }
+                            val scaleColor = if (item.companySizeName.isNullOrEmpty()) {
+                                R.color.mainBackground.convertColor(context)
+                            } else {
+                                R.color.themeColor.convertColor(context)
+                            }
 
-                            val scaleTextColor =
-                                if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) {
-                                    R.color.gray.convertColor(context)
-                                } else {
-                                    R.color.white.convertColor(context)
-                                }
+                            val scaleTextColor = if (item.companySizeName.isNullOrEmpty()) {
+                                R.color.gray.convertColor(context)
+                            } else {
+                                R.color.white.convertColor(context)
+                            }
 
-                            viewHolder.setBackgroundColor(R.id.agreementLevelView, color)
+                            viewHolder.setText(R.id.agreementLevelView, item.grade.toChineseGrade())
                                 .setTextColor(R.id.agreementLevelView, textColor)
-                                .setText(R.id.agreementLevelView, item.grade.toChineseGrade())
+                                .setBackgroundColor(R.id.agreementLevelView, color)
                                 .setText(R.id.customerNameView, item.customerName)
                                 .setText(R.id.scaleView, companySize)
                                 .setTextColor(R.id.scaleView, scaleTextColor)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 22ddd2c..e730b45 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -149,6 +149,7 @@
                             viewHolder: ViewHolder, position: Int,
                             item: CustomerListModel.DataModel.RowsModel
                         ) {
+
                             val color = when (item.grade) {
                                 "0" -> R.color.color_A.convertColor(context)
                                 "1" -> R.color.color_B.convertColor(context)
@@ -156,7 +157,6 @@
                                 "3" -> R.color.color_D.convertColor(context)
                                 else -> R.color.mainBackground.convertColor(context)
                             }
-                            viewHolder.setBackgroundColor(R.id.agreementLevelView, color)
 
                             val textColor = when (item.grade) {
                                 "0" -> R.color.textColor_A.convertColor(context)
@@ -165,11 +165,13 @@
                                 "3" -> R.color.textColor_D.convertColor(context)
                                 else -> R.color.gray.convertColor(context)
                             }
-                            viewHolder.setTextColor(R.id.agreementLevelView, textColor)
-                                .setText(R.id.agreementLevelView, item.grade.toChineseGrade())
+
+                            viewHolder.setText(R.id.agreementLevelView, item.grade.toChineseGrade())
+                                .setTextColor(R.id.agreementLevelView, textColor)
+                                .setBackgroundColor(R.id.agreementLevelView, color)
                                 .setText(R.id.customerNameView, item.customerName)
-                                .setText(R.id.overallView, "公司规模：${item.evaluationName}")
-                                .setText(R.id.fullAddressView, "公司地址：${item.fullAddress}")
+                                .setText(R.id.overallView, "分类：${item.evaluationName}")
+                                .setText(R.id.fullAddressView, "地址：${item.fullAddress}")
                         }
                     }
                     customerRecyclerView.addItemDecoration(
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 d18e817..7cbc203 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
@@ -162,7 +162,6 @@
                                 "3" -> R.color.color_D.convertColor(context)
                                 else -> R.color.mainBackground.convertColor(context)
                             }
-                            viewHolder.setBackgroundColor(R.id.agreementLevelView, color)
 
                             val textColor = when (item.grade) {
                                 "0" -> R.color.textColor_A.convertColor(context)
@@ -171,13 +170,34 @@
                                 "3" -> R.color.textColor_D.convertColor(context)
                                 else -> R.color.gray.convertColor(context)
                             }
-                            viewHolder.setTextColor(R.id.agreementLevelView, textColor)
+
+                            val companySize = if (item.companySizeName.isNullOrEmpty()) {
+                                "规模未知"
+                            } else {
+                                item.companySizeName
+                            }
+
+                            val scaleColor = if (item.companySizeName.isNullOrEmpty()) {
+                                R.color.mainBackground.convertColor(context)
+                            } else {
+                                R.color.themeColor.convertColor(context)
+                            }
+
+                            val scaleTextColor = if (item.companySizeName.isNullOrEmpty()) {
+                                R.color.gray.convertColor(context)
+                            } else {
+                                R.color.white.convertColor(context)
+                            }
 
                             viewHolder.setText(R.id.agreementLevelView, item.grade.toChineseGrade())
+                                .setTextColor(R.id.agreementLevelView, textColor)
+                                .setBackgroundColor(R.id.agreementLevelView, color)
                                 .setText(R.id.customerNameView, item.customerName)
-                                .setText(R.id.scaleView, item.companySizeName)
-                                .setText(R.id.overallView, "公司规模：${item.evaluationName}")
-                                .setText(R.id.fullAddressView, "公司地址：${item.fullAddress}")
+                                .setText(R.id.scaleView, companySize)
+                                .setTextColor(R.id.scaleView, scaleTextColor)
+                                .setBackgroundColor(R.id.scaleView, scaleColor)
+                                .setText(R.id.overallView, "分类：${item.evaluationName}")
+                                .setText(R.id.fullAddressView, "地址：${item.fullAddress}")
                         }
                     }
                     customerRecyclerView.addItemDecoration(