RuoYi
2020-09-04 857a5b26e72193fa38d0ea884cf54d04cd2e1b0c
数据权限中的空值处理
1 files modified
6 ■■■■ changed files
ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java 6 ●●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
@@ -81,11 +81,11 @@
        }
        // 获取当前的用户
        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());