diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt
index 6ee464dd..d4a3da6f 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt
@@ -52,8 +52,10 @@ class HeartCpActivity : BaseMvpActivity<HeartCpPresenter, ActivityHeartCpBinding
         }
         mBinding.ivHelp.setOnClickListener {
             val dialog = DialogWebView(this)
-            dialog.show(CommonAppContext.getInstance()
-                .getCurrentEnvironment().serverUrl + "api/Page/page_show?id=31")
+            dialog.show(
+                CommonAppContext.getInstance().currentEnvironment.serverUrl
+                        + "api/Page/page_show?id=31"
+            )
         }
 
         mBinding.ivHeadLeft.setOnClickListener {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/ItemCpHeartAdapter.kt b/MainModule/src/main/java/com/xscm/modulemain/adapter/ItemCpHeartAdapter.kt
index 4d2ce62f..19c6687f 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/ItemCpHeartAdapter.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/ItemCpHeartAdapter.kt
@@ -36,7 +36,7 @@ class ItemCpHeartAdapter(
             tv.setTextColor(context.getColor(R.color.ff4a89ff))
             R.color.ffff53cc
         }
-        if (item.remark.contains(item.to_user_info.nickname)) {
+        if (item.remark.contains(item.to_user_info.nickname) && item.to_user_info.nickname.isNotEmpty()) {
             val builder = getContentColor(item.to_user_info.nickname, item.remark, cid)
             helper.setText(R.id.tv_content, builder)
         } else {