opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 18:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java.

Browse Source 
数据权限优化，优化点：支持一个权限加载多个DataColumn,未匹配上权限模板时,若elsesql是空字符串不会进行join导致数据权限解析错误。总体让权限更灵活
This commit is contained in:
Mincycle 2022-07-14 02:20:19 +00:00 committed by Gitee
parent b2a927cc5e
commit 57ddbeef3f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.collection.ConcurrentHashSet;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.annotation.DataColumn; import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission; import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.dto.RoleDTO; import com.ruoyi.common.core.domain.dto.RoleDTO;
@ -123,6 +124,7 @@ public class PlusDataPermissionHandler {
return ""; return "";
} }
boolean isSuccess = false; boolean isSuccess = false;
boolean needParser = false;
for (DataColumn dataColumn : dataColumns) { for (DataColumn dataColumn : dataColumns) {
// 不包含 key 变量 则不处理 // 不包含 key 变量 则不处理
if (!StringUtils.contains(type.getSqlTemplate(), "#" + dataColumn.key())) { if (!StringUtils.contains(type.getSqlTemplate(), "#" + dataColumn.key())) {
@ -131,13 +133,19 @@ public class PlusDataPermissionHandler {
// 设置注解变量 key 为表达式变量 value 为变量值 // 设置注解变量 key 为表达式变量 value 为变量值
context.setVariable(dataColumn.key(), dataColumn.value()); context.setVariable(dataColumn.key(), dataColumn.value());
needParser = true;
}
if (needParser) {
// 解析sql模板并填充 // 解析sql模板并填充
String sql = parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class); String sql = parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class);
sqlString.append(joinStr).append(sql); sqlString.append(joinStr).append(sql);
isSuccess = true; isSuccess = true;
} }
// 未处理成功则填充兜底方案 // 未处理成功则填充兜底方案
if (!isSuccess) { if (!isSuccess && StrUtil.isNotBlank(type.getElseSql()) ) {
sqlString.append(joinStr).append(type.getElseSql()); sqlString.append(joinStr).append(type.getElseSql());
} }
} }