From 3fa1ed6222be2c60e9358c44a74e840c054fe3ed 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 16:34:25 +0800
Subject: [PATCH] heihei

---
 business/jxstore/event/event.go | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go
index f1efc45cd..fd9fde15f 100644
--- a/business/jxstore/event/event.go
+++ b/business/jxstore/event/event.go
@@ -208,7 +208,7 @@ func GetMessageGroupByUser(ctx *jxcontext.Context, userID string) (messageGroupR
 	var (
 		db = dao.GetDB()
 	)
-	messageGroups, err := dao.GetMessageGroups(db, userID, 0, 0, false, "")
+	messageGroups, err := dao.GetMessageGroups(db, userID, 0, 0, true, "")
 	messageGroupMembers, err := dao.GetMessageGroupMembers(db, 0, userID)
 	for _, v := range messageGroupMembers {
 		if messageGroupList, err := dao.GetMessageGroups(db, "", v.GroupID, 0, false, ""); err == nil {
@@ -216,18 +216,17 @@ func GetMessageGroupByUser(ctx *jxcontext.Context, userID string) (messageGroupR
 		}
 	}
 	for _, v := range messageGroups {
-		var messageMemberGroups []*model.MessageGroupMember
-		sql := `
-			SELECT * FROM message_group_member WHERE group_id = ? 
-		`
-		sqlParams := []interface{}{v.GroupID}
-		if err = dao.GetRows(db, &messageMemberGroups, sql, sqlParams); err == nil {
-			if v.Type == model.GroupTypeSingle {
-				user, err := dao.GetUserByID(db, "user_id", messageMemberGroups[0].MemberUserID)
-				if err == nil {
-					v.Name = user.Name
-					v.Avatar = user.Avatar
-				}
+		//是这个人创建的群聊，如果是单聊就返回对方的头像
+		if v.Type == model.GroupTypeSingle {
+			var userID2 string
+			if v.UserID == userID {
+				userID2 = v.MessageGroupMembers[0].MemberUserID
+			} else {
+				userID2 = userID
+			}
+			if user, err := dao.GetUserByID(db, "user_id", userID2); err == nil {
+				v.Avatar = user.Avatar
+				v.Name = user.Name
 			}
 		}
 	}