diff --git a/app/src/main/java/com/gh/common/view/ExpandTextView.java b/app/src/main/java/com/gh/common/view/ExpandTextView.java
index becf21376a..f79e135cd7 100644
--- a/app/src/main/java/com/gh/common/view/ExpandTextView.java
+++ b/app/src/main/java/com/gh/common/view/ExpandTextView.java
@@ -96,7 +96,6 @@ public class ExpandTextView extends AppCompatTextView {
         CharSequence content = mSnapshotText.subSequence(start, lastLineEnd);
 
         if (viewWidth - lastLineRight > expandTextWidth) {
-            // TODO 可能最后一行只有一个字符，这里的 -ADDITIONAL_END_TEXT_COUNT 有隐藏问题
             if (mUseGradientAlphaEndText) {
                 finalEndText = content.toString().substring(content.length() - additionalEndTextCount, content.length()) + mEndText;
                 finalEndText = finalEndText.replace("\n", " ");
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
index 269578aaf1..2b220c202e 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
@@ -203,7 +203,16 @@ class DescAdapter(context: Context,
     private fun bindCustomColumnViewHolder(viewHolder: GameDetailCustomColumnViewHolder, detailEntity: DetailEntity) {
         val customColumn = detailEntity.customColumn!!
         val tags = if (customColumn.showInfoTag == true) customColumn.infoTag else arrayListOf()
-        val maxDesLines = if (mExpandSparseBooleanArray.get(viewHolder.adapterPosition)) Int.MAX_VALUE else customColumn.showDesRowNum!!
+        val maxDesLines = if (mExpandSparseBooleanArray.get(viewHolder.adapterPosition)) { Int.MAX_VALUE } else {
+            when {
+                customColumn.showDesType == "all" || customColumn.showDesRowNum == 0 -> {
+                    Int.MAX_VALUE
+                }
+                else -> {
+                    customColumn.showDesRowNum!!
+                }
+            }
+        }
 
         viewHolder.binding.titleHintTv.paint?.isUnderlineText = true
         viewHolder.binding.contentTv.setExpandMaxLines(maxDesLines)