若依 3.1.0

RuoYi

2021-08-01 24be1a436efadf22ada78bb569c9f2f79a07e0c1

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

@@ -12,10 +12,10 @@
import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.web.domain.BaseEntity;

import com.ruoyi.common.datascope.annotation.DataScope;

import com.ruoyi.common.datascope.service.AwaitUserService;

import com.ruoyi.common.security.service.TokenService;

import com.ruoyi.system.api.domain.SysRole;

import com.ruoyi.system.api.domain.SysUser;

import com.ruoyi.system.api.model.UserInfo;

import com.ruoyi.system.api.model.LoginUser;



/**

 * 数据过滤处理

@@ -57,7 +57,7 @@
    public static final String DATA_SCOPE = "dataScope";



    @Autowired

    private AwaitUserService awaitUserService;

    private TokenService tokenService;



    // 配置织入点

    @Pointcut("@annotation(com.ruoyi.common.datascope.annotation.DataScope)")

@@ -68,6 +68,7 @@
    @Before("dataScopePointCut()")

    public void doBefore(JoinPoint point) throws Throwable

    {

        clearDataScope(point);

        handleDataScope(point);

    }



@@ -80,12 +81,12 @@
            return;

        }

        // 获取当前的用户

        UserInfo loginUser = awaitUserService.info();

        SysUser currentUser = loginUser.getSysUser();

        if (currentUser != null)

        LoginUser loginUser = tokenService.getLoginUser();

        if (StringUtils.isNotNull(loginUser))

        {

            SysUser currentUser = loginUser.getSysUser();

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

            if (!currentUser.isAdmin())

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

            {

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

                        controllerDataScope.userAlias());

@@ -169,4 +170,17 @@
        }

        return null;

    }



    /**

     * 拼接权限sql前先清空params.dataScope参数防止注入

     */

    private void clearDataScope(final JoinPoint joinPoint)

    {

        Object params = joinPoint.getArgs()[0];

        if (StringUtils.isNotNull(params) && params instanceof BaseEntity)

        {

            BaseEntity baseEntity = (BaseEntity) params;

            baseEntity.getParams().put(DATA_SCOPE, "");

        }

    }

}