ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

2.X
疯狂的狮子li 2022-07-14 11:00:15 +08:00
parent 377aeb845b
commit 08b352f428
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,8 @@ import java.lang.annotation.*;
/** /**
* 数据权限 * 数据权限
* *
* 一个注解只能对应一个模板
*
* @author Lion Li * @author Lion Li
* @version 3.5.0 * @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";
} }

19
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java
View File

@ -107,12 +107,12 @@ public class PlusDataPermissionHandler {
StringBuilder sqlString = new StringBuilder(); StringBuilder sqlString = new StringBuilder();
// 更新或删除需满足所有条件 // 更新或删除需满足所有条件
String joinStr = isSelect ? " OR " : " AND "; String joinStr = isSelect ? " OR " : " AND ";
LoginUser loginUser = DataPermissionHelper.getVariable("user"); LoginUser user = DataPermissionHelper.getVariable("user");
StandardEvaluationContext context = new StandardEvaluationContext(); StandardEvaluationContext context = new StandardEvaluationContext();
context.setBeanResolver(beanResolver); context.setBeanResolver(beanResolver);
DataPermissionHelper.getContext().forEach(context::setVariable); DataPermissionHelper.getContext().forEach(context::setVariable);
for (RoleDTO role : loginUser.getRoles()) { for (RoleDTO role : user.getRoles()) {
loginUser.setRoleId(role.getRoleId()); user.setRoleId(role.getRoleId());
// 获取角色权限泛型 // 获取角色权限泛型
DataScopeType type = DataScopeType.findCode(role.getDataScope()); DataScopeType type = DataScopeType.findCode(role.getDataScope());
if (ObjectUtil.isNull(type)) { if (ObjectUtil.isNull(type)) {
@ -124,12 +124,19 @@ public class PlusDataPermissionHandler {
} }
boolean isSuccess = false; boolean isSuccess = false;
for (DataColumn dataColumn : dataColumns) { for (DataColumn dataColumn : dataColumns) {
if (dataColumn.key().length != dataColumn.value().length) {
throw new ServiceException("角色数据范围异常 => key与value长度不匹配");
}
// 不包含 key 变量 则不处理 // 不包含 key 变量 则不处理
if (!StringUtils.contains(type.getSqlTemplate(), "#" + dataColumn.key())) { if (!StringUtils.containsAny(type.getSqlTemplate(),
Arrays.stream(dataColumn.key()).map(key -> "#" + key).toArray(String[]::new)
)) {
continue; continue;
} }
// 设置注解变量 key 为表达式变量 value 为变量值 // 设置注解变量 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模板并填充 // 解析sql模板并填充
String sql = parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class); String sql = parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class);
@ -137,7 +144,7 @@ public class PlusDataPermissionHandler {
isSuccess = true; isSuccess = true;
} }
// 未处理成功则填充兜底方案 // 未处理成功则填充兜底方案
if (!isSuccess) { if (!isSuccess && StringUtils.isNotBlank(type.getElseSql())) {
sqlString.append(joinStr).append(type.getElseSql()); sqlString.append(joinStr).append(type.getElseSql());
} }
} }