优化代码

RuoYi

2022-09-09 e3b12f5621abf80b7c52355c0f6c27dcec7a083d

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

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

import org.aspectj.lang.annotation.Before;

import org.springframework.stereotype.Component;

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

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.aspectj.lang.annotation.DataScope;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.framework.security.context.PermissionContextHolder;

import com.ruoyi.framework.web.domain.BaseEntity;

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

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

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

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

            {

                String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), PermissionContextHolder.getContext());

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

                        controllerDataScope.userAlias());

                        controllerDataScope.userAlias(), permission);

            }

        }

    }

@@ -83,8 +86,9 @@
     * @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 deptAlias, String userAlias, String permission)

    {

        StringBuilder sqlString = new StringBuilder();

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

@@ -96,6 +100,11 @@
            {

                continue;

            }

            if (StringUtils.isNotEmpty(permission) && StringUtils.isNotEmpty(role.getPermissions())

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

            {

                continue;

            }

            if (DATA_SCOPE_ALL.equals(dataScope))

            {

                sqlString = new StringBuilder();