Merge remote-tracking branch 'origin/tuoyun' into tuoyun

internal/rpc/office/office.go

@@ -165,7 +165,7 @@ func (s *officeServer) SendMsg2Tag(_ context.Context, req *pbOffice.SendMsg2TagR
 		}
 		groupUserIDList = append(groupUserIDList, userIDList...)
 	}
-	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), groupUserIDList, req.GroupList)
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), groupUserIDList, req.GroupList)
 	var userIDList []string
 	userIDList = append(userIDList, tagUserIDList...)
 	userIDList = append(userIDList, groupUserIDList...)

internal/rpc/user/user.go

@@ -93,6 +93,7 @@ func syncPeerUserConversation(conversation *pbUser.Conversation, operationID str
 			log.NewError(operationID, utils.GetSelfFuncName(), "SetConversation error", err.Error())
 			return err
 		}
+
 		chat.SetConversationNotification(operationID, conversation.UserID)
 	}
 	return nil

pkg/common/db/mysql_model/im_mysql_model/user_model.go

@@ -379,10 +379,10 @@ func GetConversations(OwnerUserID string, conversationIDs []string) ([]db.Conver
 }
 
 func CreateConversationIfNotExist(conversation db.Conversation) error {
-	//dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
-	//if err != nil {
+	if err != nil {
-	//	return err
+		return err
-	//}
+	}
-	//err = dbConn.Model(&db.Conversation{}).Where().Find().Error
+	err = dbConn.Model(&db.Conversation{}).Create(conversation).Error
 	return nil
 }