From 3e7800551a3839aa6226b4ea48ee2ca0a2d2d0e7 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 4 Aug 2022 18:30:59 +0800 Subject: [PATCH 1/2] query --- business/jxstore/event/event.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index f47a6f85d..54a3ed320 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -482,9 +482,9 @@ func AddMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err er if len(messageGroupMembers) > 0 { return fmt.Errorf("此用户已经在该群组中了！") } - if len(messageGroupMembers3) > 0 { - return fmt.Errorf("您已经有群组[%v]了，不能申请加入其它群！", messageGroupMembers3[0].GroupID) - } + //if len(messageGroupMembers3) > 0 { + // return fmt.Errorf("您已经有群组[%v]了，不能申请加入其它群！", messageGroupMembers3[0].GroupID) + //} if len(messageGroupsResult) > 0 { return fmt.Errorf("请不要加入自己创建的群！") } @@ -493,9 +493,9 @@ func AddMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err er return fmt.Errorf("抱歉该群组已经满员了！") } } - if len(messageGroupsResult3) > 0 { - return fmt.Errorf("您已经拥有[%v]群了，不能再加入其它群！", messageGroupsResult3[0].GroupID) - } + //if len(messageGroupsResult3) > 0 { + // return fmt.Errorf("您已经拥有[%v]群了，不能再加入其它群！", messageGroupsResult3[0].GroupID) + //} messageGroupMember := &model.MessageGroupMember{ GroupID: groupID, From 5f91a82539c3122d8f68191bffe2e18f019cf31f Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 4 Aug 2022 18:31:28 +0800 Subject: [PATCH 2/2] query --- business/jxstore/event/event.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index 54a3ed320..4f921fbc5 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -474,7 +474,7 @@ func AddMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err er messageGroupMembers3, err := dao.GetMessageGroupMembers(db, 0, 0, userID) messageGroupsResult, err := dao.GetMessageGroups(db, userID, 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, "") if err != nil { return err