内容通知评论功能联调测试bug修改

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<EpdcNoticeCommentListResultDTO> noticeCommentList(@LoginUser TokenDto userDetail, @RequestBody EpdcNoticeCommentListFormDTO formDto) {
+    public Result<EpdcNoticeCommentListResultDTO> noticeCommentList(@LoginUser TokenDto userDetail, EpdcNoticeCommentListFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
 
         return newsService.listNoticeComments(userDetail, formDto);

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;
 
     /**

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<EpdcNoticeCommentsResultDTO> commentsListResultDTO;
+    private List<EpdcNoticeCommentsResultDTO> commentsList;
 
 }

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<NoticeCommentDao,
         List<EpdcNoticeCommentsResultDTO> list = baseDao.selectListNoticeComments(formDto);
         EpdcNoticeCommentListResultDTO data = new EpdcNoticeCommentListResultDTO();
         data.setStatementNum(statementNum);
-        data.setCommentsListResultDTO(list);
+        data.setCommentsList(list);
         return new Result<EpdcNoticeCommentListResultDTO>().ok(data);
     }
 

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeCommentDao.xml

@@ -127,7 +127,7 @@
         <result property="commentTime" column="CREATED_TIME"/>
         <result property="shieldFlag" column="SHIELD_FLAG"/>
         <result property="user.userId" column="USER_ID"/>
-        <result property="user.userName" column="USERNAME"/>
+        <result property="user.userName" column="USER_NAME"/>
         <result property="user.userFace" column="USER_FACE"/>
         <result property="replyComment.userName" column="replyUserName"/>
         <result property="replyComment.content" column="replyContent"/>
@@ -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