新增插件跳过执行方法.

baomidou · Dec 11, 2024 · eb9bc20 · eb9bc20
1 parent 7edef39
commit eb9bc20
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/...lus-core/src/main/java/com/baomidou/mybatisplus/core/plugins/InterceptorIgnoreHelper.java b/...lus-core/src/main/java/com/baomidou/mybatisplus/core/plugins/InterceptorIgnoreHelper.java
@@ -25,6 +25,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * @author miemie
@@ -93,6 +94,24 @@ public static IgnoreStrategy getIgnoreStrategy(String key) {
         return IGNORE_STRATEGY_CACHE.get(key);
     }
 
+    /**
+     * 按指定策略执行指定方法
+     *
+     * @param ignoreStrategy 忽略策略
+     * @param supplier       执行方法
+     * @param <T>            T
+     * @return 返回值
+     * @since 3.5.10
+     */
+    public static <T> T execute(IgnoreStrategy ignoreStrategy, Supplier<T> supplier) {
+        try {
+            handle(ignoreStrategy);
+            return supplier.get();
+        } finally {
+            clearIgnoreStrategy();
+        }
+    }
+
     /**
      * 初始化缓存
      * <p>

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/tenant/TenantTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/tenant/TenantTest.java
@@ -1,6 +1,8 @@
 package com.baomidou.mybatisplus.test.tenant;
 
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
+import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
@@ -92,6 +94,15 @@ void test() {
             Assertions.assertEquals(0, m.deleteById(entity.getId()));
             Assertions.assertEquals(1, m.deleteByIdWithIgnore(entity.getId()));
         });
+
+        doTest(m -> {
+            Entity entity = new Entity().setName("秋秋").setTenantId(2);
+            m.insert(entity);
+            Assertions.assertNull(m.selectById(entity.getId()));
+            Assertions.assertNotNull(InterceptorIgnoreHelper.execute(IgnoreStrategy.builder().tenantLine(true).build(), () -> m.selectById(entity.getId())));
+            Assertions.assertEquals(0, m.deleteById(entity.getId()));
+            Assertions.assertEquals(1, InterceptorIgnoreHelper.execute(IgnoreStrategy.builder().tenantLine(true).build(), () -> m.deleteById(entity.getId())));
+        });
     }
 
     @Override