From dd939c779e4a2158727daba46039840003fc10bf Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 18 Mar 2021 14:56:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=80=9A=E7=9F=A5=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E5=8A=9F=E8=83=BD=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiNewsController.java | 2 +- .../dto/epdc/form/EpdcNoticeCommentSubmitFormDTO.java | 1 - .../dto/epdc/result/EpdcNoticeCommentListResultDTO.java | 2 +- .../esua/epdc/service/impl/NoticeCommentServiceImpl.java | 2 +- .../src/main/resources/mapper/NoticeCommentDao.xml | 8 ++++---- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java index 8450218e..8573f233 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java @@ -317,7 +317,7 @@ public class ApiNewsController { * @since 2021/3/16 13:43 */ @GetMapping("notice/comment/list") - public Result noticeCommentList(@LoginUser TokenDto userDetail, @RequestBody EpdcNoticeCommentListFormDTO formDto) { + public Result noticeCommentList(@LoginUser TokenDto userDetail, EpdcNoticeCommentListFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return newsService.listNoticeComments(userDetail, formDto); diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeCommentSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeCommentSubmitFormDTO.java index d8ea3ad9..7a57fac5 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeCommentSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeCommentSubmitFormDTO.java @@ -36,7 +36,6 @@ public class EpdcNoticeCommentSubmitFormDTO implements Serializable { /** * 评论人ID */ - @NotNull(message = "评论人ID不能为空") private String userId; /** diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeCommentListResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeCommentListResultDTO.java index b9701c6a..e36e970e 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeCommentListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeCommentListResultDTO.java @@ -23,6 +23,6 @@ public class EpdcNoticeCommentListResultDTO implements Serializable { /** * 最新最热 评论列表 */ - private List commentsListResultDTO; + private List commentsList; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeCommentServiceImpl.java index c5af138d..e45734be 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeCommentServiceImpl.java @@ -171,7 +171,7 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl list = baseDao.selectListNoticeComments(formDto); EpdcNoticeCommentListResultDTO data = new EpdcNoticeCommentListResultDTO(); data.setStatementNum(statementNum); - data.setCommentsListResultDTO(list); + data.setCommentsList(list); return new Result().ok(data); } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeCommentDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeCommentDao.xml index 38a1ced2..48a57459 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeCommentDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeCommentDao.xml @@ -127,7 +127,7 @@ - + @@ -140,10 +140,10 @@ t2.CREATED_TIME, t2.USER_ID, t2.USER_FACE, - t2.USERNAME, + t2.USER_NAME, t2.SHIELD_FLAG, t3.ID AS replyId, - t3.USERNAME AS replyUserName, + t3.USER_NAME AS replyUserName, t3.CONTENT AS replyContent FROM ( @@ -154,7 +154,7 @@ t1.CREATED_TIME, t1.USER_ID, t1.USER_FACE, - t1.USERNAME, + t1.USER_NAME, t1.SHIELD_FLAG FROM epdc_notice_comment t1