From a28dd0fe4057d9d1c52be85457ad0c3882ec2d40 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 18:26:09 +0800
Subject: [PATCH] fix 修复 数据加密拦截器空数据异常
---
ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java
index 925d4e4..4e1c366 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisDecryptInterceptor.java
@@ -55,17 +55,20 @@
* @param sourceObject 寰呭姞瀵嗗璞�
*/
private void decryptHandler(Object sourceObject) {
- if (sourceObject instanceof Map) {
- ((Map<?, Object>) sourceObject).values().forEach(this::decryptHandler);
+ if (sourceObject instanceof Map<?, ?> map) {
+ map.values().forEach(this::decryptHandler);
return;
}
- if (sourceObject instanceof List) {
+ if (sourceObject instanceof List<?> list) {
+ if(CollectionUtil.isEmpty(list)) {
+ return;
+ }
// 鍒ゆ柇绗竴涓厓绱犳槸鍚﹀惈鏈夋敞瑙ｃ�傚鏋滄病鏈夌洿鎺ヨ繑鍥烇紝鎻愰珮鏁堢巼
- Object firstItem = ((List<?>) sourceObject).get(0);
+ Object firstItem = list.get(0);
if (CollectionUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) {
return;
}
- ((List<?>) sourceObject).forEach(this::decryptHandler);
+ list.forEach(this::decryptHandler);
return;
}
Set<Field> fields = encryptorManager.getFieldCache(sourceObject.getClass());
--
Gitblit v1.9.3