程序调整优化

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CommentFileDTO.java

@@ -22,5 +22,7 @@ public class CommentFileDTO implements Serializable {
 	private Integer size;
 	private Integer duration;
 	@JsonIgnore
+	private String commentId;
+	@JsonIgnore
 	private String userId;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeCommentFormDTO.java

@@ -23,7 +23,7 @@ public class NoticeCommentFormDTO {
      * 评论内容300
      */
     @NotBlank(message = "评论内容不能为空",groups = {NoticeCommentFormDTO.UserShow.class})
-    @Length(max = 20, message = "评论内容不能超过300个字符",groups = {NoticeCommentFormDTO.UserShow.class})
+    @Length(max = 300, message = "评论内容不能超过300个字符",groups = {NoticeCommentFormDTO.UserShow.class})
     private String commentContent;
 
     /**

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java

@@ -169,6 +169,7 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
         if (!result.success()) {
             throw new RenException("调用user服务，获取用户基础数据失败");
         }
+
         //3.查询活动评论所有人员的附件信息
         List<CommentFileDTO> fileList = actCommentAttachmentService.getActComFile(formDTO.getGroupActId());
 
@@ -184,7 +185,7 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
                 //每一条评论的附件信息
                 List<CommentFileDTO> imageList = new ArrayList<>();
                 for (CommentFileDTO f : fileList) {
-                    if (l.getCommentUserId().equals(f.getUserId())) {
+                    if (l.getCommentId().equals(f.getCommentId()) && l.getCommentUserId().equals(f.getUserId())) {
                         imageList.add(f);
                     }
                 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java

@@ -224,7 +224,7 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
             //每一条评论的附件信息
             List<CommentFileDTO> imageList = new ArrayList<>();
             for (CommentFileDTO f : fileList) {
-                if (l.getUserId().equals(f.getUserId())) {
+                if (l.getNoticeCommentId().equals(f.getCommentId()) && l.getUserId().equals(f.getUserId())) {
                     imageList.add(f);
                 }
             }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@@ -411,7 +411,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                 //每一条评论的附件信息
                 List<CommentFileDTO> imageList = new ArrayList<>();
                 for (CommentFileDTO f : fileList) {
-                    if (l.getUserId().equals(f.getUserId())) {
+                    if (l.getCommentId().equals(f.getCommentId()) && l.getUserId().equals(f.getUserId())) {
                         imageList.add(f);
                     }
                 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeCommentAttachmentDao.xml

@@ -12,6 +12,7 @@
             attachment_url url,
             sort sort,
             duration duration,
+            notice_comment_id commentId,
             created_by userId
         FROM
             notice_comment_attachment

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentAttachmentDao.xml

@@ -12,6 +12,7 @@
             attachment_url url,
             sort sort,
             duration duration,
+            topic_comment_id commentId,
             created_by userId
         FROM
             resi_topic_comment_attachment