若依 3.4.0

RuoYi

2021-02-22 9fb18e47c484db522b91c01c85d679ab364fb809

 src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -79,11 +79,11 @@
        }

        // 获取当前的用户

        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());

        SysUser currentUser = loginUser.getUser();

        if (currentUser != null)

        if (StringUtils.isNotNull(loginUser))

        {

            SysUser currentUser = loginUser.getUser();

            // 如果是超级管理员，则不过滤数据

            if (!currentUser.isAdmin())

            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())

            {

                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),

                        controllerDataScope.userAlias());