소스 검색

code style

miemie 5 년 전
부모
커밋
b3a9a2a3c7

+ 0 - 2
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java

@@ -26,7 +26,6 @@ import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils;
 import com.baomidou.mybatisplus.extension.toolkit.PropertyMapper;
 import com.baomidou.mybatisplus.extension.toolkit.PropertyMapper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlParserUtils;
 import com.baomidou.mybatisplus.extension.toolkit.SqlParserUtils;
 import lombok.Data;
 import lombok.Data;
-import lombok.experimental.Accessors;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Alias;
 import net.sf.jsqlparser.expression.Alias;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Expression;
@@ -63,7 +62,6 @@ import java.util.stream.Collectors;
  * @since 2020-06-16
  * @since 2020-06-16
  */
  */
 @Data
 @Data
-@Accessors(chain = true)
 @SuppressWarnings({"rawtypes"})
 @SuppressWarnings({"rawtypes"})
 public class PaginationInnerInterceptor implements InnerInterceptor {
 public class PaginationInnerInterceptor implements InnerInterceptor {
 
 

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

@@ -16,11 +16,13 @@
 package com.baomidou.mybatisplus.extension.plugins.inner;
 package com.baomidou.mybatisplus.extension.plugins.inner;
 
 
 import com.baomidou.mybatisplus.core.parser.SqlParserHelper;
 import com.baomidou.mybatisplus.core.parser.SqlParserHelper;
+import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
 import com.baomidou.mybatisplus.extension.plugins.tenant.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.tenant.TenantLineHandler;
+import com.baomidou.mybatisplus.extension.toolkit.PropertyMapper;
 import lombok.*;
 import lombok.*;
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Expression;
@@ -45,6 +47,7 @@ import org.apache.ibatis.session.RowBounds;
 import java.sql.Connection;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.List;
+import java.util.Properties;
 
 
 /**
 /**
  * @author hubin
  * @author hubin
@@ -318,6 +321,12 @@ public class TenantLineInnerInterceptor extends JsqlParserSupport implements Inn
         column.append(tenantLineHandler.getTenantIdColumn());
         column.append(tenantLineHandler.getTenantIdColumn());
         return new Column(column.toString());
         return new Column(column.toString());
     }
     }
+
+    @Override
+    public void setProperties(Properties properties) {
+        PropertyMapper.newInstance(properties)
+            .whenNotBlack("tenantLineHandler", ClassUtils::newInstance, this::setTenantLineHandler);
+    }
 }
 }