更新 MybatisConfiguration.java.ftl

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/util/config/MybatisConfiguration.java.ftl

@@ -17,12 +17,8 @@ import org.springframework.context.annotation.Configuration;
 import org.mybatis.spring.annotation.MapperScan;
 import java.util.Properties;
 <#if sys.getSaaSMode()==1>
-import cn.ibizlab.resourcescheduling.util.security.AuthenticationUser;
-import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
 import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
 import com.baomidou.mybatisplus.core.parser.ISqlParser;
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.StringValue;
 import java.util.ArrayList;
 import java.util.List;
 </#if>
@@ -56,7 +52,7 @@ public class MybatisConfiguration {
      * @return
      */
     @Bean
-    public PaginationInterceptor paginationInterceptor() {
+    public PaginationInterceptor paginationInterceptor(<#if sys.getSaaSMode()==1>SaaSTenantHandler saaSTenantHandler</#if>) {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
         // 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求  默认false
         // paginationInterceptor.setOverflow(false);
@@ -64,31 +60,12 @@ public class MybatisConfiguration {
         paginationInterceptor.setLimit(-1);
 <#if sys.getSaaSMode()==1>
 
-        // 创建SQL解析器集合
+         // 创建SQL解析器集合
         List<ISqlParser> sqlParserList = new ArrayList<>();
         // 创建租户SQL解析器
         TenantSqlParser tenantSqlParser = new TenantSqlParser();
-
         // 设置租户处理器
-        tenantSqlParser.setTenantHandler(new TenantHandler() {
-
-            @Override
-            public Expression getTenantId(boolean where) {
-                AuthenticationUser user = AuthenticationUser.getAuthenticationUser();
-                return new StringValue(user.getDomain());
-            }
-
-            @Override
-            public String getTenantIdColumn() {
-                return "SRFDCID";
-            }
-
-            @Override
-            public boolean doTableFilter(String tableName) {
-                return false;
-            }
-        });
-
+        tenantSqlParser.setTenantHandler(saaSTenantHandler);
         sqlParserList.add(tenantSqlParser);
         paginationInterceptor.setSqlParserList(sqlParserList);
 </#if>