This commit is contained in:
苏尹岚
2020-11-11 15:42:10 +08:00
parent 396e46636a
commit 5d9108c646
2 changed files with 13 additions and 3 deletions

View File

@@ -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 := `