This commit is contained in:
苏尹岚
2020-11-11 16:34:25 +08:00
parent 1256ff79cd
commit 3fa1ed6222

View File

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