若依 3.6.0

RuoYi

2022-07-16 87009e72bf8634c6c4848b6f0ef882be3bddd8cf

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

@@ -1,21 +1,16 @@
package com.ruoyi.common.datascope.aspect;



import java.lang.reflect.Method;

import org.aspectj.lang.JoinPoint;

import org.aspectj.lang.Signature;

import org.aspectj.lang.annotation.Aspect;

import org.aspectj.lang.annotation.Before;

import org.aspectj.lang.annotation.Pointcut;

import org.aspectj.lang.reflect.MethodSignature;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;

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.utils.SecurityUtils;

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;



/**

 * 数据过滤处理

@@ -56,36 +51,22 @@
     */

    public static final String DATA_SCOPE = "dataScope";



    @Autowired

    private AwaitUserService awaitUserService;



    // 配置织入点

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

    public void dataScopePointCut()

    @Before("@annotation(controllerDataScope)")

    public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable

    {

        clearDataScope(point);

        handleDataScope(point, controllerDataScope);

    }



    @Before("dataScopePointCut()")

    public void doBefore(JoinPoint point) throws Throwable

    protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope)

    {

        handleDataScope(point);

    }



    protected void handleDataScope(final JoinPoint joinPoint)

    {

        // 获得注解

        DataScope controllerDataScope = getAnnotationLog(joinPoint);

        if (controllerDataScope == null)

        {

            return;

        }

        // 获取当前的用户

        UserInfo loginUser = awaitUserService.info();

        SysUser currentUser = loginUser.getSysUser();

        if (currentUser != null)

        LoginUser loginUser = SecurityUtils.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());

@@ -138,31 +119,32 @@
                else

                {

                    // 数据权限为仅本人且没有userAlias别名不查询任何数据

                    sqlString.append(" OR 1=0 ");

                    sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));

                }

            }

        }



        if (StringUtils.isNotBlank(sqlString.toString()))

        {

            BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0];

            baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");

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

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

            {

                BaseEntity baseEntity = (BaseEntity) params;

                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");

            }

        }

    }



    /**

     * 是否存在注解，如果存在就获取

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

     */

    private DataScope getAnnotationLog(JoinPoint joinPoint)

    private void clearDataScope(final JoinPoint joinPoint)

    {

        Signature signature = joinPoint.getSignature();

        MethodSignature methodSignature = (MethodSignature) signature;

        Method method = methodSignature.getMethod();



        if (method != null)

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

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

        {

            return method.getAnnotation(DataScope.class);

            BaseEntity baseEntity = (BaseEntity) params;

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

        }

        return null;

    }

}