BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 5308e309eadfef5d785b2ea589922b01925f8db1

Authored by YunaiV
1 parent 379c143d

同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java
  View file @5308e30
... ... @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
5 5 import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
6 6 import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFactory;
7 7 import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
8   -import com.alibaba.ttl.TransmittableThreadLocal;
9 8 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
10 9 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
11 10 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
... ... @@ -508,6 +507,9 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
508 507 // 单条规则的条件
509 508 String tableName = MyBatisUtils.getTableName(table);
510 509 Expression oneExpress = rule.getExpression(tableName, table.getAlias());
  510 + if (oneExpress == null){
  511 + continue;
  512 + }
511 513 // 拼接到 allExpression 中
512 514 allExpression = allExpression == null ? oneExpress
513 515 : new AndExpression(allExpression, oneExpress);
... ...