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 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..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,8 +495,9 @@ 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 +506,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;