blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-23 18:00:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

Browse Source 
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
This commit is contained in:
wangchuxiao 2023-03-15 16:45:17 +08:00
parent becd3eb8f1
commit d75d1f57e4
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/common/db/controller/user.go
View File

@ -48,7 +48,6 @@ func (u *userDatabase) InitOnce(ctx context.Context, users []*relation.UserModel
if len(miss) > 0 { if len(miss) > 0 {
_ = u.userDB.Create(ctx, miss) _ = u.userDB.Create(ctx, miss)
} }
return nil return nil
} }

2
pkg/common/db/relation/user_model.go
View File

@ -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) { 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, "") err = utils.Wrap(u.db().Where("user_id in (?)", userIDs).Find(&users).Error, "")
return users, err return users, err
} }