数据权限中的空值处理

4 years ago · e8e8717bf0
parent 6712d442b0
commit e8e8717bf0
1 changed files with 3 additions and 3 deletions
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
+++ b/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 (currentUser != null)
+        if (StringUtils.isNotNull(loginUser))
        {
+            SysUser currentUser = loginUser.getSysUser();
            // 如果是超级管理员，则不过滤数据
-            if (!currentUser.isAdmin())
+            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
            {
                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
                        controllerDataScope.userAlias());