admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 DateColumn 支持单模板多key场景

Browse Source
This commit is contained in:
疯狂的狮子li 2022-07-14 10:55:49 +08:00
parent 77ac99a1d0
commit ae707d340b
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
View File

@ -5,6 +5,8 @@ import java.lang.annotation.*;
/**
* 数据权限
*
* 一个注解只能对应一个模板
*
* @author Lion Li
* @version 3.5.0
*/
@ -16,11 +18,11 @@ public @interface DataColumn {
/**
* 占位符关键字
*/
String key() default "deptName";
String[] key() default "deptName";
/**
* 占位符替换值
*/
String value() default "dept_id";
String[] value() default "dept_id";
}

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

@ -124,12 +124,19 @@ public class PlusDataPermissionHandler {
}
boolean isSuccess = false;
for (DataColumn dataColumn : dataColumns) {
if (dataColumn.key().length != dataColumn.value().length) {
throw new ServiceException("角色数据范围异常 => key与value长度不匹配");
}
// 不包含 key 变量 则不处理
if (!StringUtils.contains(type.getSqlTemplate(), "#" + dataColumn.key())) {
if (!StringUtils.containsAny(type.getSqlTemplate(),
Arrays.stream(dataColumn.key()).map(key -> "#" + key).toArray(String[]::new)
)) {
continue;
}
// 设置注解变量 key 为表达式变量 value 为变量值
context.setVariable(dataColumn.key(), dataColumn.value());
for (int i = 0; i < dataColumn.key().length; i++) {
context.setVariable(dataColumn.key()[i], dataColumn.value()[i]);
}
// 解析sql模板并填充
String sql = parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class);
@ -137,7 +144,7 @@ public class PlusDataPermissionHandler {
isSuccess = true;
}
// 未处理成功则填充兜底方案
if (!isSuccess) {
if (!isSuccess && StringUtils.isNotBlank(type.getElseSql())) {
sqlString.append(joinStr).append(type.getElseSql());
}
}