From 297a16847b644b769c15509ada7b4dc2ad84361d Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Mon, 17 Jun 2024 10:40:04 +0800
Subject: [PATCH] ~

---
 .../app/controller/AppDynamicCommentController.java   |  1 -
 .../service/impl/AppDynamicCommentServiceImpl.java    |  6 +++++-
 .../ruoyi/app/service/impl/AppUserServiceImpl.java    | 11 +++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java
index 6f4c1b9..d117f49 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java
@@ -119,7 +119,6 @@ public class AppDynamicCommentController extends BaseController
     @GetMapping("/treeList")
     @ApiOperation(value = "评论树列表", notes = "评论树列表", httpMethod = "GET")
     public AjaxResult treeList(AppDynamicComment appDynamicComment) {
-        startPage();
         Map list = appDynamicCommentService.treeList(appDynamicComment);
         return AjaxResult.success(list);
     }
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java
index e0b0a86..dfba8a1 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java
@@ -19,6 +19,8 @@ import com.ruoyi.app.mapper.AppDynamicCommentMapper;
 import com.ruoyi.app.domain.AppDynamicComment;
 import com.ruoyi.app.service.IAppDynamicCommentService;
 
+import static com.ruoyi.common.core.utils.PageUtils.startPage;
+
 /**
  * 动态评论Service业务层处理
  * 
@@ -126,10 +128,12 @@ public class AppDynamicCommentServiceImpl implements IAppDynamicCommentService
         if (appDynamicComment.getDynamicId() == null) {
             return map;
         }
+        List<AppDynamicCommentVo> list = appDynamicCommentMapper.selectCommentList(appDynamicComment);
+        startPage();
         List<AppDynamicCommentVo> appDynamicComments = appDynamicCommentMapper.selectCommentList(appDynamicComment);
         List<AppDynamicCommentVo> parentList = appDynamicComments.stream().filter(entity -> entity.getParentId() == null).collect(Collectors.toList());
         List<AppDynamicCommentVo> srcList = appDynamicComments.stream().filter(entity -> entity.getParentId() != null).collect(Collectors.toList());
-        map.put("countNum",appDynamicComments.size());
+        map.put("countNum",list.size());
         map.put("list",buildList(parentList,srcList));
         return map;
     }
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
index 9f48a85..d9b8a20 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
@@ -65,6 +65,9 @@ public class AppUserServiceImpl implements IAppUserService {
     @Autowired
     private AppRegisterMapper appRegisterMapper;
 
+    @Autowired
+    private AppDynamicCommentMapper appDynamicCommentMapper;
+
     @Override
     public AjaxResult statistics() {
         StatisticsVo statisticsVo = new StatisticsVo();
@@ -221,6 +224,14 @@ public class AppUserServiceImpl implements IAppUserService {
             List<AppUserDynamic> list = appUserDynamicMapper.selectAppUserDynamicList(appUserDynamic);
             if (list != null && list.size() > 0) {
                 for (AppUserDynamic userDynamic : list) {
+                    AppDynamicComment appDynamicComment = new AppDynamicComment();
+                    appDynamicComment.setDynamicId(userDynamic.getId());
+                    List<AppDynamicComment> appDynamicComments = appDynamicCommentMapper.selectAppDynamicCommentList(appDynamicComment);
+                    if (appDynamicComments != null && list.size() > 0) {
+                        for (AppDynamicComment dynamicComment : appDynamicComments) {
+                            appDynamicCommentMapper.deleteAppDynamicCommentById(dynamicComment.getId());
+                        }
+                    }
                     appUserDynamicMapper.deleteAppUserDynamicById(userDynamic.getId());
                 }
             }