数据权限中的空值处理

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java

@@ -81,11 +81,11 @@ public class DataScopeAspect
         }
         // 获取当前的用户
         LoginUser loginUser = tokenService.getLoginUser();
-        SysUser currentUser = loginUser.getSysUser();
+        if (StringUtils.isNotNull(loginUser))
-        if (currentUser != null)
         {
+            SysUser currentUser = loginUser.getSysUser();
             // 如果是超级管理员，则不过滤数据
-            if (!currentUser.isAdmin())
+            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
             {
                 dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
                         controllerDataScope.userAlias());