升级druid到最新版本v1.1.23

RuoYi

2020-09-04 abef552b59ee6f0390437301776c2758576d11e8

 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());