From d75d1f57e4f061407f1979e7acadf6d44bc055ac Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 15 Mar 2023 16:45:17 +0800 Subject: [PATCH] Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode # Conflicts: # pkg/common/mw/rpc_server_interceptor.go --- pkg/common/db/controller/user.go | 1 - pkg/common/db/relation/user_model.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/common/db/controller/user.go b/pkg/common/db/controller/user.go index 425821154..de09a4992 100644 --- a/pkg/common/db/controller/user.go +++ b/pkg/common/db/controller/user.go @@ -48,7 +48,6 @@ func (u *userDatabase) InitOnce(ctx context.Context, users []*relation.UserModel if len(miss) > 0 { _ = u.userDB.Create(ctx, miss) } - return nil } diff --git a/pkg/common/db/relation/user_model.go b/pkg/common/db/relation/user_model.go index e7a5f2a8e..4de1784a7 100644 --- a/pkg/common/db/relation/user_model.go +++ b/pkg/common/db/relation/user_model.go @@ -38,7 +38,7 @@ func (u *UserGorm) Update(ctx context.Context, users []*relation.UserModel) (err // 获取指定用户信息 不存在，也不返回错误 func (u *UserGorm) Find(ctx context.Context, userIDs []string) (users []*relation.UserModel, err error) { - log.ZDebug(ctx, "Find args", "userIDs", userIDs) + log.ZDebug(ctx, "Find args", "userIDs", userIDs, "db", u.db()) err = utils.Wrap(u.db().Where("user_id in (?)", userIDs).Find(&users).Error, "") return users, err }