From 5199cfe94715eec2591ff09b8fbaa91a1fe88251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 16 Nov 2020 17:31:42 +0800
Subject: [PATCH] heihei

---
 business/jxstore/event/event.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go
index 46726f920..09f7d3b57 100644
--- a/business/jxstore/event/event.go
+++ b/business/jxstore/event/event.go
@@ -133,6 +133,16 @@ func CreateMessageGroup(ctx *jxcontext.Context, userID, userID2, groupName strin
 		db      = dao.GetDB()
 		groupID int
 	)
+	for {
+		groupID = jxutils.GenRand6()
+		temp := &model.MessageGroup{
+			GroupID: groupID,
+		}
+		dao.GetEntity(db, temp, "GroupID")
+		if temp.UserID == "" {
+			break
+		}
+	}
 	if userID2 != "" {
 		messageGroups, err := dao.GetMessageGroups(db, userID, 0, model.GroupTypeSingle, true, userID2)
 		if len(messageGroups) > 0 && len(messageGroups[0].MessageGroupMembers) > 0 {
@@ -145,16 +155,6 @@ func CreateMessageGroup(ctx *jxcontext.Context, userID, userID2, groupName strin
 		if user == nil {
 			return nil, fmt.Errorf("无法找到要联系的用户！")
 		}
-		for {
-			groupID = jxutils.GenRand6()
-			temp := &model.MessageGroup{
-				GroupID: groupID,
-			}
-			dao.GetEntity(db, temp, "GroupID")
-			if temp.UserID == "" {
-				break
-			}
-		}
 		messageGroup := &model.MessageGroup{
 			GroupID: groupID,
 			UserID:  userID,