Commit d430f6cb2696b398117ef913c12ea1a32286303d

Authored by 芋道源码
Committed by GitHub
2 parents 47d3f0bc eed3d8b1

Merge pull request #225 from xuing/master

修复某些情况下ContextHolder的NPE异常
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java
... ... @@ -539,11 +539,11 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme
539 539 /**
540 540 * 该 {@link MappedStatement} 对应的规则
541 541 */
542   - private static final ThreadLocal<List<DataPermissionRule>> RULES = new TransmittableThreadLocal<>();
  542 + private static final ThreadLocal<List<DataPermissionRule>> RULES = ThreadLocal.withInitial(Collections::emptyList);
543 543 /**
544 544 * SQL 是否进行重写
545 545 */
546   - private static final ThreadLocal<Boolean> REWRITE = new TransmittableThreadLocal<>();
  546 + private static final ThreadLocal<Boolean> REWRITE = ThreadLocal.withInitial(() -> Boolean.FALSE);
547 547  
548 548 public static void init(List<DataPermissionRule> rules) {
549 549 RULES.set(rules);
... ...