From 8ade5042267172cd27ceb7febdf9b82976328cd8 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 23 Jun 2022 18:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E9=80=9A=E8=BF=87=E7=9A=84=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TDemandCommentServiceImpl.java            | 3 +++
 .../resources/mapper/demandComment/TDemandCommentDao.xml   | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java
index 9253d0e9..7188712a 100644
--- a/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java
@@ -63,6 +63,9 @@ public class TDemandCommentServiceImpl extends CrudServiceImpl<TDemandCommentDao
                 break;
             }
         });
+        if (!params.containsKey("creator")) {
+            wrapper.eq(StringUtils.isNotBlank(params.get("creator").toString()), "del_flag", 0);
+        }
         wrapper.orderByDesc("create_date");
         return wrapper;
     }
diff --git a/renren-admin/src/main/resources/mapper/demandComment/TDemandCommentDao.xml b/renren-admin/src/main/resources/mapper/demandComment/TDemandCommentDao.xml
index f8cf3377..4d8129c2 100644
--- a/renren-admin/src/main/resources/mapper/demandComment/TDemandCommentDao.xml
+++ b/renren-admin/src/main/resources/mapper/demandComment/TDemandCommentDao.xml
@@ -19,11 +19,12 @@
     </resultMap>
     <select id="commentCount" resultType="java.lang.Long">
         SELECT
-            COUNT( id )
+        COUNT( id )
         FROM
-            t_demand_comment
+        t_demand_comment
         WHERE
-            target_id = #{dataId};
+        del_flag = 0
+        AND target_id = #{dataId};
     </select>
 
 </mapper>
\ No newline at end of file