1. 修复 CompanyDataPermissionIgnoreAspect 空指针问题
This commit is contained in:
@@ -19,6 +19,10 @@ public class CompanyDataPermissionIgnoreAspect {
|
|||||||
public Object around(ProceedingJoinPoint joinPoint, CompanyDataPermissionIgnore companyDataPermissionIgnore) throws Throwable {
|
public Object around(ProceedingJoinPoint joinPoint, CompanyDataPermissionIgnore companyDataPermissionIgnore) throws Throwable {
|
||||||
boolean oldIgnore = CompanyContextHolder.isIgnore();
|
boolean oldIgnore = CompanyContextHolder.isIgnore();
|
||||||
try {
|
try {
|
||||||
|
if (companyDataPermissionIgnore == null) {
|
||||||
|
Class<?> targetClass = joinPoint.getTarget().getClass();
|
||||||
|
companyDataPermissionIgnore = targetClass.getAnnotation(CompanyDataPermissionIgnore.class);
|
||||||
|
}
|
||||||
Object enable = SpringExpressionUtils.parseExpression(companyDataPermissionIgnore.enable());
|
Object enable = SpringExpressionUtils.parseExpression(companyDataPermissionIgnore.enable());
|
||||||
if (Boolean.TRUE.equals(enable)) {
|
if (Boolean.TRUE.equals(enable)) {
|
||||||
CompanyContextHolder.setIgnore(true);
|
CompanyContextHolder.setIgnore(true);
|
||||||
|
|||||||
Reference in New Issue
Block a user