From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
index 899ea8b..2c52b88 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
@@ -89,6 +89,7 @@
             target.setReplyId(reply.getId());
             target.setReplyMemberId(reply.getMemberId());
             target.setCommentId(reply.getId());
+            target.setCommentMemberId(reply.getMemberId());
             target.setType(Constants.ONE);
         }
 
@@ -264,7 +265,7 @@
         replyWrapper.selectAs(Comment::getCommentId,ActivityReplyCommentDTO::getCommentId);
         replyWrapper.selectAs(Comment::getMemberId,ActivityReplyCommentDTO::getMemberId);
         replyWrapper.selectAs(Comment::getContent,ActivityReplyCommentDTO::getContent);
-        replyWrapper.selectAs(Member::getNickname,ActivityReplyCommentDTO::getMemberNikeName);
+        replyWrapper.selectAs(Member::getNickname,ActivityReplyCommentDTO::getNikeName);
         replyWrapper.selectAs(Member::getImgurl,ActivityReplyCommentDTO::getMemberImgUrl);
         replyWrapper.selectCount(Comment::getId,ActivityReplyCommentDTO::getReplyCount);
         replyWrapper.selectMin(Comment::getCreateDate,ActivityReplyCommentDTO::getCreateDate);
@@ -324,7 +325,7 @@
         MPJLambdaWrapper<Comment> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
         queryWrapper.selectAll(Comment.class);
-        queryWrapper.selectAs(Member::getNickname,ActivityReplyCommentDTO::getMemberNikeName);
+        queryWrapper.selectAs(Member::getNickname,ActivityReplyCommentDTO::getNikeName);
         queryWrapper.selectAs(Member::getImgurl,ActivityReplyCommentDTO::getMemberImgUrl);
         if(Objects.isNull(pageWrap.getModel().getMemberId())){
             queryWrapper.select(" 0 ",ActivityReplyCommentDTO::getZanStatus);

--
Gitblit v1.9.3