通知公告新增阅读用户&详细

RuoYi

2026-04-14 7a4f61cf5e8d42d24907ccc3d7345d25012d3a55

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

@@ -6,6 +6,10 @@
import org.aspectj.lang.annotation.Aspect;

import org.aspectj.lang.annotation.Before;

import org.springframework.stereotype.Component;

import com.ruoyi.common.core.constant.Constants;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.context.SecurityContextHolder;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.common.core.utils.StringUtils;

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

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

@@ -23,31 +27,6 @@
@Component

public class DataScopeAspect

{

    /**

     * 全部数据权限

     */

    public static final String DATA_SCOPE_ALL = "1";



    /**

     * 自定数据权限

     */

    public static final String DATA_SCOPE_CUSTOM = "2";



    /**

     * 部门数据权限

     */

    public static final String DATA_SCOPE_DEPT = "3";



    /**

     * 部门及以下数据权限

     */

    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";



    /**

     * 仅本人数据权限

     */

    public static final String DATA_SCOPE_SELF = "5";



    /**

     * 数据权限过滤关键字

     */

@@ -70,8 +49,8 @@
            // 如果是超级管理员，则不过滤数据

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

            {

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

                        controllerDataScope.userAlias());

                String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission());

                dataScopeFilter(joinPoint, currentUser, controllerDataScope.userAlias(), controllerDataScope.deptAlias(), controllerDataScope.userField(), controllerDataScope.deptField(), permission);

            }

        }

    }

@@ -83,55 +62,78 @@
     * @param user 用户

     * @param deptAlias 部门别名

     * @param userAlias 用户别名

     * @param permission 权限字符

     */

    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)

    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String userAlias, String deptAlias, String userField, String deptField, String permission)

    {

        StringBuilder sqlString = new StringBuilder();

        List<String> conditions = new ArrayList<String>();

        List<String> scopeCustomIds = new ArrayList<String>();

        user.getRoles().forEach(role -> {

            if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))

            {

                scopeCustomIds.add(Convert.toStr(role.getRoleId()));

            }

        });



        for (SysRole role : user.getRoles())

        {

            String dataScope = role.getDataScope();

            if (!DATA_SCOPE_CUSTOM.equals(dataScope) && conditions.contains(dataScope))

            if (conditions.contains(dataScope) || StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE))

            {

                continue;

            }

            if (DATA_SCOPE_ALL.equals(dataScope))

            if (StringUtils.isNotEmpty(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))

            {

                continue;

            }

            if (Constants.Dept.DATA_SCOPE_ALL.equals(dataScope))

            {

                sqlString = new StringBuilder();

                conditions.add(dataScope);

                break;

            }

            else if (DATA_SCOPE_CUSTOM.equals(dataScope))

            else if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(dataScope))

            {

                sqlString.append(StringUtils.format(

                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,

                        role.getRoleId()));

                if (scopeCustomIds.size() > 1)

                {

                    // 多个自定数据权限使用in查询，避免多次拼接。

                    sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, deptField, String.join(",", scopeCustomIds)));

                }

                else

                {

                    sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, deptField, role.getRoleId()));

                }

            }

            else if (DATA_SCOPE_DEPT.equals(dataScope))

            else if (Constants.Dept.DATA_SCOPE_DEPT.equals(dataScope))

            {

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

                sqlString.append(StringUtils.format(" OR {}.{} = {} ", deptAlias, deptField, user.getDeptId()));

            }

            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))

            else if (Constants.Dept.DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))

            {

                sqlString.append(StringUtils.format(

                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",

                        deptAlias, user.getDeptId(), user.getDeptId()));

                sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, deptField, user.getDeptId(), user.getDeptId()));

            }

            else if (DATA_SCOPE_SELF.equals(dataScope))

            else if (Constants.Dept.DATA_SCOPE_SELF.equals(dataScope))

            {

                if (StringUtils.isNotBlank(userAlias))

                {

                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));

                    sqlString.append(StringUtils.format(" OR {}.{} = {} ", userAlias, userField, user.getUserId()));

                }

                else

                {

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

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

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

                }

            }

            conditions.add(dataScope);

        }



        // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据

        if (StringUtils.isEmpty(conditions))

        {

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

        }



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

        {

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