From 633aefad56df969d032ec468063e1ab37077a036 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 4 Jan 2023 19:49:47 +0800 Subject: [PATCH] Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode # Conflicts: # pkg/common/db/mysql_model/im_mysql_model/group_model_k.go --- pkg/common/db/mysql_model/im_mysql_model/group_model_k.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_model_k.go b/pkg/common/db/mysql_model/im_mysql_model/group_model_k.go index 5d8f6188f..629c1108e 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_model_k.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_model_k.go @@ -50,14 +50,14 @@ func (*Group) Update(ctx context.Context, groups []*Group) (err error) { } func (*Group) Find(ctx context.Context, groupIDList []string) (groupList []*Group, err error) { - defer trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupIDList", groupIDList) + defer trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupIDList", groupIDList, "groupList", groupList) err = utils.Wrap(db.DB.MysqlDB.DefaultGormDB().Where("group_id in (?)", groupIDList).Find(&groupList).Error, "") return groupList, err } func (*Group) Take(ctx context.Context, groupID string) (group *Group, err error) { - defer trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupID", groupID) group = &Group{} + defer trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupID", groupID, "group", *group) err = utils.Wrap(db.DB.MysqlDB.DefaultGormDB().Where("group_id = ?", groupID).Take(group).Error, "") return group, err }