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 14641145f8a3b8a17e68e29524e1fe01f578235c..e6f5027801cb6c9a086fca0303f0386c0dbaaaec 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 executeSave(List documentList, MongoCollection 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> executeUpdate(List> updatePairList, MongoCollection 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 executeAggregates(List aggregateConditionList, MongoCollection 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> executeBulkWrite(List> writeModelList, MongoCollection collection) { - if (!isTenantIgnored(collection) && CollUtil.isNotEmpty(writeModelList)) { + if (!isTenantIgnored(collection,tenantHandler) && CollUtil.isNotEmpty(writeModelList)) { List insertDocumentList = writeModelList.stream() .filter(writeModel -> writeModel instanceof InsertOneModel) .map(writeModel -> ((InsertOneModel) 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());