From e2659d65be6494f9f737cddcec8292ac39cc5c06 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 七月 2024 23:20:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
index 3f36bd0..a00f525 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -298,7 +298,10 @@
                     }else {
                         articleCommentsVO1.setIslike(2);
                     }
-                    articleCommentsVOList1.add(articleCommentsVO1);
+                    if (data1!=null){
+                        articleCommentsVOList1.add(articleCommentsVO1);
+                    }
+
                 }
 
                 articleCommentsVO.setArticleCommentsVOList(articleCommentsVOList1);

--
Gitblit v1.7.1