From 4bf8a030abe48e3d2decab7dc0d5d90b587c5795 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 5 Jun 2023 15:51:55 +0800 Subject: [PATCH] fix black --- pkg/common/db/controller/black.go | 2 ++ pkg/common/db/relation/black_model.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/common/db/controller/black.go b/pkg/common/db/controller/black.go index 7479722b8..61fe19c79 100644 --- a/pkg/common/db/controller/black.go +++ b/pkg/common/db/controller/black.go @@ -5,6 +5,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" ) @@ -68,6 +69,7 @@ func (b *blackDatabase) CheckIn(ctx context.Context, userID1, userID2 string) (i if err != nil { return } + log.ZDebug(ctx, "blackIDs", "user1BlackIDs", userID1BlackIDs, "user2BlackIDs", userID2BlackIDs) return utils.IsContain(userID2, userID1BlackIDs), utils.IsContain(userID1, userID2BlackIDs), nil } diff --git a/pkg/common/db/relation/black_model.go b/pkg/common/db/relation/black_model.go index ffef848c2..2faadda0c 100644 --- a/pkg/common/db/relation/black_model.go +++ b/pkg/common/db/relation/black_model.go @@ -58,5 +58,5 @@ func (b *BlackGorm) FindOwnerBlacks(ctx context.Context, ownerUserID string, pag } func (b *BlackGorm) FindBlackUserIDs(ctx context.Context, ownerUserID string) (blackUserIDs []string, err error) { - return blackUserIDs, utils.Wrap(b.db(ctx).Where("owner_user_id = ?", blackUserIDs).Pluck("block_user_id", &blackUserIDs).Error, "") + return blackUserIDs, utils.Wrap(b.db(ctx).Where("owner_user_id = ?", ownerUserID).Pluck("block_user_id", &blackUserIDs).Error, "") }