From 5128d2b100b54963c08022248df5fbc72c36fc53 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 8 Aug 2022 09:13:41 +0800 Subject: [PATCH] 1 --- business/jxstore/event/event.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index ebe635467..f47a6f85d 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -471,10 +471,10 @@ func AddMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err er db = dao.GetDB() ) 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, "") 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 @@ -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,