From 7c235822506ea42191aaab8b517dea8d34ac7034 Mon Sep 17 00:00:00 2001 From: "1351515658@qq.com" <1351515658@qq.com> Date: Wed, 3 Jan 2024 10:16:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=BC=E5=AE=B9xml=E7=9A=84sql=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=E4=B8=AD=E8=A1=A8=E5=90=8D=E7=A7=B0=E5=B8=A6`?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7=20=20=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90sql?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/db/DataPermissionDatabaseInterceptor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java index 98f64d11a..b42dfde07 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java @@ -495,8 +495,10 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme // 生成条件 Expression allExpression = null; for (DataPermissionRule rule : ContextHolder.getRules()) { + + String tableName = MyBatisUtils.getTableName(table); // 判断表名是否匹配 - if (!rule.getTableNames().contains(table.getName())) { + if (!rule.getTableNames().contains(tableName)) { continue; } // 如果有匹配的规则，说明可重写。 @@ -505,7 +507,6 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme ContextHolder.setRewrite(true); // 单条规则的条件 - String tableName = MyBatisUtils.getTableName(table); Expression oneExpress = rule.getExpression(tableName, table.getAlias()); if (oneExpress == null){ continue; From 1382c712986f4731dc23cc1a96b942bb246e365a Mon Sep 17 00:00:00 2001 From: "1351515658@qq.com" <1351515658@qq.com> Date: Wed, 3 Jan 2024 10:24:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20selectJoinList=E7=9A=84BUG=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E4=B8=8E=E7=A7=9F=E6=88=B7=E6=8F=92=E4=BB=B6=E5=86=B2?= =?UTF-8?q?=E7=AA=81=EF=BC=9A=E8=A7=A3=E6=9E=90SQL=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E5=BC=82=E5=B8=B8=20https://gitee.com/best?= =?UTF-8?q?=5Fhandsome/mybatis-plus-join/issues/I84GYW=20=20=20=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7mybatis-plus-join=E5=92=8Cmybatis-plus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-dependencies/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index eba907b2e..2d554055c 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -26,10 +26,10 @@ 4.3.0 1.2.19 - 3.5.3.2 - 3.5.3.2 + 3.5.4.1 + 3.5.4.1 3.6.1 - 1.4.6 + 1.4.8 3.18.0 8.1.2.141 From df564909ff719a539b934583e34d0f1586ba5b47 Mon Sep 17 00:00:00 2001 From: "1351515658@qq.com" <1351515658@qq.com> Date: Wed, 3 Jan 2024 18:53:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89DataPermissionDatabaseInt?= =?UTF-8?q?erceptor=E7=A9=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/db/DataPermissionDatabaseInterceptor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java index b42dfde07..59825d494 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java @@ -495,7 +495,6 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme // 生成条件 Expression allExpression = null; for (DataPermissionRule rule : ContextHolder.getRules()) { - String tableName = MyBatisUtils.getTableName(table); // 判断表名是否匹配 if (!rule.getTableNames().contains(tableName)) {