From ff125d53aa713023afede82d00305ed31ade01ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 24 Nov 2020 17:09:46 +0800
Subject: [PATCH] aa

---
 business/jxstore/event/event.go |  2 +-
 business/model/dao/event.go     | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go
index 6ed579c77..7c14ee2f7 100644
--- a/business/jxstore/event/event.go
+++ b/business/jxstore/event/event.go
@@ -174,7 +174,7 @@ func CreateMessageGroup(ctx *jxcontext.Context, userID, userID2, groupName strin
 		if data, err := json.Marshal(messageGroup); err == nil {
 			json.Unmarshal(data, &messageGroupResult)
 			messageGroupResult.Name = user.Name
-			messageGroupResult.MessageGroupMembers = append(messageGroupResult.MessageGroupMembers, messageGroupMember)
+			// messageGroupResult.MessageGroupMembers = append(messageGroupResult.MessageGroupMembers, messageGroupMember)
 		}
 	} else {
 		userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal)
diff --git a/business/model/dao/event.go b/business/model/dao/event.go
index 1085fab68..0d6740c96 100644
--- a/business/model/dao/event.go
+++ b/business/model/dao/event.go
@@ -200,12 +200,17 @@ func GetImMessageRecord(db *DaoDB, groupID int, userID string, storeID, vendorID
 
 type GetMessageGroupsResult struct {
 	model.MessageGroup
-	Avatar              string                      `json:"avatar"`
-	LastMessageType     int                         `json:"lastMessageType"`
-	LastContent         string                      `json:"lastContent"`
-	LastTime            time.Time                   `json:"lastTime"`
-	LastUserName        string                      `json:"lastUserName"`
-	MessageGroupMembers []*model.MessageGroupMember `json:"messageGroupMembers"`
+	Avatar              string                          `json:"avatar"`
+	LastMessageType     int                             `json:"lastMessageType"`
+	LastContent         string                          `json:"lastContent"`
+	LastTime            time.Time                       `json:"lastTime"`
+	LastUserName        string                          `json:"lastUserName"`
+	MessageGroupMembers []*GetMessageGroupsMemberResult `json:"messageGroupMembers"`
+}
+
+type GetMessageGroupsMemberResult struct {
+	model.User
+	model.MessageGroupMember
 }
 
 func GetMessageGroups(db *DaoDB, userID string, groupID, groupType int, isMember bool, userID2 string) (messageGroupsResult []*GetMessageGroupsResult, err error) {
@@ -230,9 +235,12 @@ func GetMessageGroups(db *DaoDB, userID string, groupID, groupType int, isMember
 	if err = GetRows(db, &messageGroupsResult, sql, sqlParams); err == nil {
 		if isMember {
 			for _, v := range messageGroupsResult {
-				var messageGroupMembers []*model.MessageGroupMember
+				var messageGroupMembers []*GetMessageGroupsMemberResult
 				sql2 := `
-					SELECT * FROM message_group_member WHERE group_id = ?
+					SELECT a.*, b.* 
+					  FROM message_group_member a 
+					  JOIN user b ON b.user_id = a.member_user_id
+					 WHERE a.group_id = ?
 				`
 				sqlParams2 := []interface{}{v.GroupID}
 				if userID2 != "" {