From 5d9108c6467ad8d1fb11b83a1101f3d21268e3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 11 Nov 2020 15:42:10 +0800
Subject: [PATCH] heihei

---
 business/jxstore/event/event.go | 10 ++++++++--
 business/model/dao/event.go     |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go
index 37798d25a..0da03351d 100644
--- a/business/jxstore/event/event.go
+++ b/business/jxstore/event/event.go
@@ -134,7 +134,7 @@ func CreateMessageGroup(ctx *jxcontext.Context, userID, userID2, groupName strin
 		groupID int
 	)
 	if userID2 != "" {
-		messageGroups, err := dao.GetMessageGroups(db, userID, model.GroupTypeSingle, true, userID2)
+		messageGroups, err := dao.GetMessageGroups(db, userID, 0, model.GroupTypeSingle, true, userID2)
 		if len(messageGroups) > 0 && len(messageGroups[0].MessageGroupMembers) > 0 {
 			return messageGroups[0], err
 		}
@@ -208,7 +208,13 @@ func GetMessageGroupByUser(ctx *jxcontext.Context, userID string) (messageGroupR
 	var (
 		db = dao.GetDB()
 	)
-	messageGroups, err := dao.GetMessageGroups(db, userID, 0, false, "")
+	messageGroups, err := dao.GetMessageGroups(db, userID, 0, 0, false, "")
+	messageGroupMembers, err := dao.GetMessageGroupMembers(db, 0, userID)
+	for _, v := range messageGroupMembers {
+		if messageGroupList, err := dao.GetMessageGroups(db, "", v.GroupID, 0, false, ""); err == nil {
+			messageGroups = append(messageGroups, messageGroupList...)
+		}
+	}
 	for _, v := range messageGroups {
 		var messageMemberGroups []*model.MessageGroupMember
 		sql := `
diff --git a/business/model/dao/event.go b/business/model/dao/event.go
index 46f6d597b..8020cda12 100644
--- a/business/model/dao/event.go
+++ b/business/model/dao/event.go
@@ -176,7 +176,7 @@ type GetMessageGroupsResult struct {
 	MessageGroupMembers []*model.MessageGroupMember `json:"messageGroupMembers"`
 }
 
-func GetMessageGroups(db *DaoDB, userID string, groupType int, isMember bool, userID2 string) (messageGroupsResult []*GetMessageGroupsResult, err error) {
+func GetMessageGroups(db *DaoDB, userID string, groupID, groupType int, isMember bool, userID2 string) (messageGroupsResult []*GetMessageGroupsResult, err error) {
 	sql := `
 		SELECT *
 		  FROM message_group
@@ -191,6 +191,10 @@ func GetMessageGroups(db *DaoDB, userID string, groupType int, isMember bool, us
 		sql += " AND type = ?"
 		sqlParams = append(sqlParams, groupType)
 	}
+	if groupID != 0 {
+		sql += " AND group_id = ?"
+		sqlParams = append(sqlParams, groupID)
+	}
 	if err = GetRows(db, &messageGroupsResult, sql, sqlParams); err == nil {
 		if isMember {
 			for _, v := range messageGroupsResult {