From ae707d340b4cf438ab13f71d50ba8a87dde16b20 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 14 七月 2022 10:55:49 +0800
Subject: [PATCH] update 优化 DateColumn 支持单模板多key场景
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java | 6 ++++--
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java | 13 ++++++++++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
index bd2ddec..df416ed 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
@@ -5,6 +5,8 @@
/**
* 鏁版嵁鏉冮檺
*
+ * 涓�涓敞瑙ｅ彧鑳藉搴斾竴涓ā鏉�
+ *
* @author Lion Li
* @version 3.5.0
*/
@@ -16,11 +18,11 @@
/**
* 鍗犱綅绗﹀叧閿瓧
*/
- String key() default "deptName";
+ String[] key() default "deptName";
/**
* 鍗犱綅绗︽浛鎹㈠��
*/
- String value() default "dept_id";
+ String[] value() default "dept_id";
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
index 7ecc12a..1a94b35 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
@@ -124,12 +124,19 @@
}
boolean isSuccess = false;
for (DataColumn dataColumn : dataColumns) {
+ if (dataColumn.key().length != dataColumn.value().length) {
+ throw new ServiceException("瑙掕壊鏁版嵁鑼冨洿寮傚父 => key涓巚alue闀垮害涓嶅尮閰�");
+ }
// 涓嶅寘鍚� 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 @@
isSuccess = true;
}
// 鏈鐞嗘垚鍔熷垯濉厖鍏滃簳鏂规
- if (!isSuccess) {
+ if (!isSuccess && StringUtils.isNotBlank(type.getElseSql())) {
sqlString.append(joinStr).append(type.getElseSql());
}
}
--
Gitblit v1.9.3