liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

heihei

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxstore/event/event.go
View File

@@ -134,7 +134,7 @@ func CreateMessageGroup(ctx *jxcontext.Context, userID, userID2, groupName strin
groupID int groupID int
) )
if userID2 != "" { 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 { if len(messageGroups) > 0 && len(messageGroups[0].MessageGroupMembers) > 0 {
return messageGroups[0], err return messageGroups[0], err
} }
@@ -208,7 +208,13 @@ func GetMessageGroupByUser(ctx *jxcontext.Context, userID string) (messageGroupR
var ( var (
db = dao.GetDB() 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 { for _, v := range messageGroups {
var messageMemberGroups []*model.MessageGroupMember var messageMemberGroups []*model.MessageGroupMember
sql := ` sql := `

6
business/model/dao/event.go
View File

@@ -176,7 +176,7 @@ type GetMessageGroupsResult struct {
MessageGroupMembers []*model.MessageGroupMember `json:"messageGroupMembers"` MessageGroupMembers []*model.MessageGroupMember `json:"messageGroupMembers"`
} }
func GetMessageGroups(db *DaoDB, userID string, groupType int, isMember bool, userID2 string) (messageGroupsResult []*GetMessageGroupsResult, err error) { func GetMessageGroups(db *DaoDB, userID string, groupID, groupType int, isMember bool, userID2 string) (messageGroupsResult []*GetMessageGroupsResult, err error) {
sql := ` sql := `
SELECT * SELECT *
FROM message_group FROM message_group
@@ -191,6 +191,10 @@ func GetMessageGroups(db *DaoDB, userID string, groupType int, isMember bool, us
sql += " AND type = ?" sql += " AND type = ?"
sqlParams = append(sqlParams, groupType) sqlParams = append(sqlParams, groupType)
} }
if groupID != 0 {
sql += " AND group_id = ?"
sqlParams = append(sqlParams, groupID)
}
if err = GetRows(db, &messageGroupsResult, sql, sqlParams); err == nil { if err = GetRows(db, &messageGroupsResult, sql, sqlParams); err == nil {
if isMember { if isMember {
for _, v := range messageGroupsResult { for _, v := range messageGroupsResult {