From a8fb2601446f1103ddc7dd798b988e8d763b72b1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 22 Apr 2021 13:29:20 +0800
Subject: [PATCH] group_message

---
 .../java/com/epmet/resi/group/dto/group/GroupMessageDTO.java    | 2 ++
 .../epmet/modules/act/service/impl/GroupActInfoServiceImpl.java | 1 +
 .../java/com/epmet/modules/group/entity/GroupMessageEntity.java | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupMessageDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupMessageDTO.java
index 06a70d0a40..7678968c5f 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupMessageDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupMessageDTO.java
@@ -49,6 +49,8 @@ public class GroupMessageDTO implements Serializable {
      */
 	private String gridId;
 
+    private String groupId;
+
     /**
      * 话题：topic;  通知：notice;  活动：act
      */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index fbb0ff629c..771435fad6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -207,6 +207,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             insert.setMessageId(insert.getId());
             insert.setType("act");
             insert.setPublishUserId(groupActInfoEntity.getPublishUserId());
+            insert.setGroupId(groupActInfoEntity.getGroupId());
             groupMessageService.save(insert);
             return;
         }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupMessageEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupMessageEntity.java
index 705f6cb9db..48ba6f3dbb 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupMessageEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupMessageEntity.java
@@ -47,6 +47,8 @@ public class GroupMessageEntity extends BaseEpmetEntity {
      */
 	private String gridId;
 
+	private String groupId;
+
     /**
      * 话题：topic;  通知：notice;  活动：act
      */