多租户

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TableNameHandler.java

@@ -29,16 +29,4 @@ public interface TableNameHandler {
      * @return String
      */
     String dynamicTableName(String sql, String tableName);
-
-    /**
-     * 根据表名判断是否进行过滤
-     * <p>
-     * 默认都要进行解析
-     *
-     * @param tableName 表名
-     * @return 是否进行过滤, true:表示忽略，false:需要解析
-     */
-    default boolean doTableFilter(String tableName) {
-        return false;
-    }
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java

@@ -45,14 +45,14 @@ public interface TenantLineHandler {
     }
 
     /**
-     * 根据表名判断是否进行过滤
+     * 根据表名判断是否忽略拼接多租户条件
      * <p>
-     * 默认都要进行解析
+     * 默认都要进行解析并拼接多租户条件
      *
      * @param tableName 表名
-     * @return 是否进行过滤, true:表示忽略，false:需要解析多租户字段
+     * @return 是否忽略, true:表示忽略，false:需要解析并拼接多租户条件
      */
-    default boolean doTableFilter(String tableName) {
+    default boolean ignoreTable(String tableName) {
         return false;
     }
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java

@@ -109,7 +109,7 @@ public class TenantLineInnerInterceptor extends JsqlParserSupport implements Inn
 
     @Override
     protected void processInsert(Insert insert, int index, Object obj) {
-        if (tenantLineHandler.doTableFilter(insert.getTable().getName())) {
+        if (tenantLineHandler.ignoreTable(insert.getTable().getName())) {
             // 过滤退出执行
             return;
         }
@@ -140,7 +140,7 @@ public class TenantLineInnerInterceptor extends JsqlParserSupport implements Inn
     @Override
     protected void processUpdate(Update update, int index, Object obj) {
         final Table table = update.getTable();
-        if (tenantLineHandler.doTableFilter(table.getName())) {
+        if (tenantLineHandler.ignoreTable(table.getName())) {
             // 过滤退出执行
             return;
         }
@@ -152,7 +152,7 @@ public class TenantLineInnerInterceptor extends JsqlParserSupport implements Inn
      */
     @Override
     protected void processDelete(Delete delete, int index, Object obj) {
-        if (tenantLineHandler.doTableFilter(delete.getTable().getName())) {
+        if (tenantLineHandler.ignoreTable(delete.getTable().getName())) {
             // 过滤退出执行
             return;
         }
@@ -194,7 +194,7 @@ public class TenantLineInnerInterceptor extends JsqlParserSupport implements Inn
         FromItem fromItem = plainSelect.getFromItem();
         if (fromItem instanceof Table) {
             Table fromTable = (Table) fromItem;
-            if (!tenantLineHandler.doTableFilter(fromTable.getName())) {
+            if (!tenantLineHandler.ignoreTable(fromTable.getName())) {
                 //#1186 github
                 plainSelect.setWhere(builderExpression(plainSelect.getWhere(), fromTable));
                 if (addColumn) {
@@ -249,7 +249,7 @@ public class TenantLineInnerInterceptor extends JsqlParserSupport implements Inn
     protected void processJoin(Join join) {
         if (join.getRightItem() instanceof Table) {
             Table fromTable = (Table) join.getRightItem();
-            if (this.tenantLineHandler.doTableFilter(fromTable.getName())) {
+            if (this.tenantLineHandler.ignoreTable(fromTable.getName())) {
                 // 过滤退出执行
                 return;
             }