Commit eed3d8b18d08cdd9f4eb58d71ee09da2d288c38e
Committed by
GitHub
1 parent
47d3f0bc
修复ContextHolder的NPE异常
Showing
1 changed file
with
2 additions
and
2 deletions
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,11 +539,11 @@ public class DataPermissionDatabaseInterceptor extends JsqlParserSupport impleme | ||
| 539 | /** | 539 | /** |
| 540 | * 该 {@link MappedStatement} 对应的规则 | 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 | * SQL 是否进行重写 | 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 | public static void init(List<DataPermissionRule> rules) { | 548 | public static void init(List<DataPermissionRule> rules) { |
| 549 | RULES.set(rules); | 549 | RULES.set(rules); |