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

Merge branch 'rsm' of e.coding.net:rosydev/jx-callback into rsm

Browse Source
This commit is contained in:
邹宗楠
2022-08-08 10:31:12 +08:00
parent 24fec9b4a7 5128d2b100
commit b393bd17b8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -471,10 +471,10 @@ func AddMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err er
db = dao.GetDB() db = dao.GetDB()
) )
messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, 0, userID) messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, 0, userID)
//messageGroupMembers3, err := dao.GetMessageGroupMembers(db, 0, 0, userID) messageGroupMembers3, err := dao.GetMessageGroupMembers(db, 0, 0, userID)
messageGroupsResult, err := dao.GetMessageGroups(db, userID, groupID, model.GroupTypeMulit, false, "") messageGroupsResult, err := dao.GetMessageGroups(db, userID, groupID, model.GroupTypeMulit, false, "")
messageGroupsResult2, err := dao.GetMessageGroups(db, "", groupID, model.GroupTypeMulit, false, "") messageGroupsResult2, err := dao.GetMessageGroups(db, "", groupID, model.GroupTypeMulit, false, "")
//messageGroupsResult3, err := dao.GetMessageGroups(db, userID, 0, model.GroupTypeMulit, false, "") messageGroupsResult3, err := dao.GetMessageGroups(db, userID, 0, model.GroupTypeMulit, false, "")
messageGroupMembers2, err := dao.GetMessageGroupMembers(db, groupID, 0, "") messageGroupMembers2, err := dao.GetMessageGroupMembers(db, groupID, 0, "")
if err != nil { if err != nil {
return err return err
@@ -482,9 +482,9 @@ func AddMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err er
if len(messageGroupMembers) > 0 { if len(messageGroupMembers) > 0 {
return fmt.Errorf("此用户已经在该群组中了！") return fmt.Errorf("此用户已经在该群组中了！")
} }
//if len(messageGroupMembers3) > 0 { if len(messageGroupMembers3) > 0 {
// return fmt.Errorf("您已经有群组[%v]了，不能申请加入其它群！", messageGroupMembers3[0].GroupID) return fmt.Errorf("您已经有群组[%v]了，不能申请加入其它群！", messageGroupMembers3[0].GroupID)
//} }
if len(messageGroupsResult) > 0 { if len(messageGroupsResult) > 0 {
return fmt.Errorf("请不要加入自己创建的群！") return fmt.Errorf("请不要加入自己创建的群！")
} }
@@ -493,9 +493,9 @@ func AddMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err er
return fmt.Errorf("抱歉该群组已经满员了！") return fmt.Errorf("抱歉该群组已经满员了！")
} }
} }
//if len(messageGroupsResult3) > 0 { if len(messageGroupsResult3) > 0 {
// return fmt.Errorf("您已经拥有[%v]群了，不能再加入其它群！", messageGroupsResult3[0].GroupID) return fmt.Errorf("您已经拥有[%v]群了，不能再加入其它群！", messageGroupsResult3[0].GroupID)
//} }
messageGroupMember := &model.MessageGroupMember{ messageGroupMember := &model.MessageGroupMember{
GroupID: groupID, GroupID: groupID,