From 6376fa1fe182d22b09dfa1122cabd7da25909da5 Mon Sep 17 00:00:00 2001 From: 86182 Date: Thu, 3 Nov 2022 13:40:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/api/CommentsApi.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java index 8745a5eb..7afd9bc2 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java @@ -84,6 +84,23 @@ public class CommentsApi extends ApiBaseController{ return badRequest("参数异常"); } List list = service.list(objType, objId); + + List ids=new ArrayList(); + for(Comments c: list) { + if(c.getReplys()>0) { + ids.add(c.getId()); + } + } + List replyList = service.findReplysByCommentIds(20, objType, ids); + + for(Comments c: list) { + c.setReplyList(new ArrayList()); + for(Comments r: replyList) { + if(r.getCommentId().equals(c.getId())) { + c.getReplyList().add(r); + } + } + } return success(list); } From ec27fe1794e5cd0d08024b81205113f60ed3b4ab Mon Sep 17 00:00:00 2001 From: 86182 Date: Thu, 3 Nov 2022 14:00:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/interaction/api/CommentsApi.java | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java index 7afd9bc2..86bcce6b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java @@ -2,6 +2,7 @@ package com.xboe.module.interaction.api; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import com.xboe.common.utils.StringUtil; import com.xboe.module.interaction.dto.CommentsDto; @@ -85,22 +86,16 @@ public class CommentsApi extends ApiBaseController{ } List list = service.list(objType, objId); - List ids=new ArrayList(); - for(Comments c: list) { - if(c.getReplys()>0) { - ids.add(c.getId()); - } - } +// List ids=new ArrayList(); +// for(Comments c: list) { +// if(c.getReplys()>0) { +// ids.add(c.getId()); +// } +// } + List ids = list.stream().map(Comments::getId).collect(Collectors.toList()); List replyList = service.findReplysByCommentIds(20, objType, ids); - for(Comments c: list) { - c.setReplyList(new ArrayList()); - for(Comments r: replyList) { - if(r.getCommentId().equals(c.getId())) { - c.getReplyList().add(r); - } - } - } + list.addAll(replyList); return success(list); } From da00eb49d6533a8e7ab4f5971bc2dc1773374bf8 Mon Sep 17 00:00:00 2001 From: 86182 Date: Thu, 3 Nov 2022 14:02:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/interaction/api/CommentsApi.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java index 86bcce6b..dd09c004 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java @@ -93,9 +93,11 @@ public class CommentsApi extends ApiBaseController{ // } // } List ids = list.stream().map(Comments::getId).collect(Collectors.toList()); - List replyList = service.findReplysByCommentIds(20, objType, ids); + if(!ids.isEmpty()) { + List replyList = service.findReplysByCommentIds(20, objType, ids); - list.addAll(replyList); + list.addAll(replyList); + } return success(list); }