From 7de6164aed14be7bff0dd8da40ca422ac4cea484 Mon Sep 17 00:00:00 2001
From: maqc <mqc0537@126.com>
Date: Wed, 25 Dec 2024 13:25:24 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=9F=E6=88=B7=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=99=A8ignoreCollection=E6=9C=AA=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: maqc <mqc0537@126.com>
---
 .../mongo/interceptor/business/TenantInterceptor.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mongo-plus-core/src/main/java/com/anwen/mongo/interceptor/business/TenantInterceptor.java b/mongo-plus-core/src/main/java/com/anwen/mongo/interceptor/business/TenantInterceptor.java
index 1464114..e6f5027 100644
--- a/mongo-plus-core/src/main/java/com/anwen/mongo/interceptor/business/TenantInterceptor.java
+++ b/mongo-plus-core/src/main/java/com/anwen/mongo/interceptor/business/TenantInterceptor.java
@@ -47,7 +47,7 @@ public class TenantInterceptor implements Interceptor {
 
     @Override
     public List<Document> executeSave(List<Document> documentList, MongoCollection<Document> collection) {
-        if (isTenantIgnored(collection) || tenantHandler.ignoreInsert(new ArrayList<>(documentList.get(0).keySet()),
+        if (isTenantIgnored(collection,tenantHandler) || tenantHandler.ignoreInsert(new ArrayList<>(documentList.get(0).keySet()),
                 tenantHandler.getTenantIdColumn())) {
             return documentList;
         }
@@ -65,7 +65,7 @@ public class TenantInterceptor implements Interceptor {
     @Override
     public List<MutablePair<Bson, Bson>> executeUpdate(List<MutablePair<Bson, Bson>> updatePairList,
                                                        MongoCollection<Document> collection) {
-        if (!isTenantIgnored(collection)) {
+        if (!isTenantIgnored(collection,tenantHandler)) {
             updatePairList.forEach(pair -> pair.setLeft(appendTenantFilter(pair.getLeft(), collection)));
         }
         return updatePairList;
@@ -79,7 +79,7 @@ public class TenantInterceptor implements Interceptor {
 
     @Override
     public List<Bson> executeAggregates(List<Bson> aggregateConditionList, MongoCollection<Document> collection) {
-        if (!isTenantIgnored(collection)) {
+        if (!isTenantIgnored(collection,tenantHandler)) {
             Bson matchBson = new AggregateWrapper().match(new QueryWrapper<>().eq(tenantHandler.getTenantIdColumn(),
                     tenantHandler.getTenantId())).getAggregateConditionList().get(0);
             boolean hasMatch = aggregateConditionList.stream()
@@ -111,7 +111,7 @@ public class TenantInterceptor implements Interceptor {
     @Override
     public List<WriteModel<Document>> executeBulkWrite(List<WriteModel<Document>> writeModelList,
                                                        MongoCollection<Document> collection) {
-        if (!isTenantIgnored(collection) && CollUtil.isNotEmpty(writeModelList)) {
+        if (!isTenantIgnored(collection,tenantHandler) && CollUtil.isNotEmpty(writeModelList)) {
             List<Document> insertDocumentList = writeModelList.stream()
                     .filter(writeModel -> writeModel instanceof InsertOneModel)
                     .map(writeModel -> ((InsertOneModel<Document>) writeModel).getDocument())
@@ -139,7 +139,7 @@ public class TenantInterceptor implements Interceptor {
         if (filter == null){
             filter = (T) new Document();
         }
-        if (!isTenantIgnored(collection)) {
+        if (!isTenantIgnored(collection,tenantHandler)) {
             BsonDocument filterDoc = filter.toBsonDocument(BsonDocument.class, MapCodecCache.getDefaultCodecRegistry());
             if (!filterDoc.containsKey(tenantHandler.getTenantIdColumn())) {
                 BsonUtil.addToMap(filter, tenantHandler.getTenantIdColumn(), tenantHandler.getTenantId());
-- 
Gitee