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 } } }