optimized code

RuoYi

2023-06-29 e134133639dff035e84a2dbc69525e9df681efee

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

@@ -6,6 +6,7 @@
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;

@@ -99,13 +100,15 @@
            {

                continue;

            }

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

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

                conditions.add(dataScope);

                break;

            }

            else if (DATA_SCOPE_CUSTOM.equals(dataScope))

@@ -139,6 +142,12 @@
            conditions.add(dataScope);

        }



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

        if (StringUtils.isEmpty(conditions))

        {

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

        }



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

        {

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