diff --git a/pom.xml b/pom.xml index d5ca53a4..4f1167a4 100644 --- a/pom.xml +++ b/pom.xml @@ -17,27 +17,26 @@ UTF-8 UTF-8 17 - 3.2.4 - 2023.0.0 + 3.2.5 + 2023.0.1 3.2.3 - 3.0.3 - 3.5.15 - 3.5.5 + 3.5.16 + 3.5.6 3.9.1 4.3.0 2.3 - 2.2.20 - 2.4.0 + 2.2.21 + 2.5.0 0.15.0 5.2.3 - 3.3.3 - 5.8.26 - 3.27.2 + 3.3.4 + 5.8.27 + 3.29.0 2.2.7 4.3.6 3.2.0 1.37.0 - 1.18.30 + 1.18.32 7.4 2.0.0-beta7 7.14.0 @@ -58,7 +57,7 @@ 4.10.0 - 3.2.0 + 3.2.1 3.11.0 @@ -171,13 +170,6 @@ ${satoken.version} - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${spring-boot.mybatis} - - org.mybatis mybatis diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index 4ccc089b..cc38e733 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -15,7 +15,7 @@ 2.2.0-SNAPSHOT - 2022.0.0.0 + 2023.0.1.0 1.8.6 1.7.1 2.2.1 diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml index b8a93209..d25f4f4d 100644 --- a/ruoyi-common/ruoyi-common-mybatis/pom.xml +++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml @@ -27,20 +27,9 @@ true - - org.mybatis.spring.boot - mybatis-spring-boot-starter - - com.baomidou mybatis-plus-spring-boot3-starter - - - org.mybatis - mybatis-spring - - diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java index f287846c..6eed8f77 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java @@ -2,14 +2,15 @@ package org.dromara.common.mybatis.interceptor; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; -import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport; +import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler; +import com.baomidou.mybatisplus.extension.plugins.inner.BaseMultiTableInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.schema.Table; import net.sf.jsqlparser.statement.delete.Delete; import net.sf.jsqlparser.statement.select.PlainSelect; import net.sf.jsqlparser.statement.select.Select; -import net.sf.jsqlparser.statement.select.SelectBody; import net.sf.jsqlparser.statement.select.SetOperationList; import net.sf.jsqlparser.statement.update.Update; import org.apache.ibatis.executor.Executor; @@ -32,7 +33,7 @@ import java.util.List; * @version 3.5.0 */ @Slf4j -public class PlusDataPermissionInterceptor extends JsqlParserSupport implements InnerInterceptor { +public class PlusDataPermissionInterceptor extends BaseMultiTableInnerInterceptor implements InnerInterceptor { private final PlusDataPermissionHandler dataPermissionHandler; @@ -75,11 +76,10 @@ public class PlusDataPermissionInterceptor extends JsqlParserSupport implements @Override protected void processSelect(Select select, int index, String sql, Object obj) { - SelectBody selectBody = select.getSelectBody(); - if (selectBody instanceof PlainSelect plainSelect) { - this.setWhere(plainSelect, (String) obj); - } else if (selectBody instanceof SetOperationList setOperationList) { - List selectBodyList = setOperationList.getSelects(); + if (select instanceof PlainSelect) { + this.setWhere((PlainSelect) select, (String) obj); + } else if (select instanceof SetOperationList setOperationList) { + List