Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_temp

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

@@ -831,6 +831,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                 attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
                 attachment.setAttachmentType("image");
+                attachment.setCustomerId(resiGroupMemberDTO.getCustomerId());
                 resiTopicAttachmentDao.insertOne(attachment);
             }
         }
@@ -846,6 +847,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                 attachment.setSort(sort++);
                 attachment.setDuration(file.getDuration());
                 attachment.setAttachmentType("voice");
+                attachment.setCustomerId(resiGroupMemberDTO.getCustomerId());
                 resiTopicAttachmentDao.insertOne(attachment);
             }
         }
@@ -855,6 +857,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         operation.setTopicId(topic.getId());
         operation.setOperationType(TopicConstant.PUBLISHMENT);
         operation.setCreatedBy(tokenDto.getUserId());
+        operation.setCustomerId(resiGroupMemberDTO.getCustomerId());
         resiTopicOperationDao.insertOne(operation);
 
         //4.小组统计信息,话题数+1