权限拦截器修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptor.java

@@ -34,6 +34,8 @@ import org.apache.poi.ss.formula.functions.T;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -63,7 +65,7 @@ public class PermissionInterceptor implements Interceptor {
         MetaObject metaObject = SystemMetaObject.forObject(statementHandler);
         MappedStatement mappedStatement = (MappedStatement) metaObject.getValue("delegate.mappedStatement");
 
-        // 处理mybatis plus
+        // TODO 处理mybatis plus
         String dataAuthRule = PermissionInterceptorContext.getDataAuthRule();
 
         // 被拦截方法
@@ -74,15 +76,15 @@ public class PermissionInterceptor implements Interceptor {
             PermissionInterceptorContext.clean();
             return invocation.proceed();
         }
+        if(!ValidationUtil.isEmpty(dataAuth)){
+            dataAuthRule = !ValidationUtil.isEmpty(dataAuthRule) ? dataAuthRule : dataAuth.interfacePath();
+        }
         // 数据权限地址为空返回空数据
-        if (ValidationUtil.isEmpty(dataAuth.interfacePath()) && ValidationUtil.isEmpty(dataAuthRule)) {
+        if(ValidationUtil.isEmpty(dataAuthRule)){
             // method.getReturnType().isPrimitive() = true 是count语句
             PermissionInterceptorContext.clean();
             return method.getReturnType().isPrimitive() ? invocation.proceed() : null;
         }
-
-        dataAuthRule = ValidationUtil.isEmpty(dataAuth.interfacePath()) ? dataAuthRule : dataAuth.interfacePath();
-
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId()
                 , RequestContext.getToken())).toString(), ReginParams.class);
         if (ValidationUtil.isEmpty(reginParam) || ValidationUtil.isEmpty(reginParam.getUserModel())) {
@@ -361,4 +363,4 @@ public class PermissionInterceptor implements Interceptor {
         }
         return ruleValue;
     }
-}
+}
\ No newline at end of file