From 1983c517479316aefbeb2b97c29c0f767d8aeaae Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 12 四月 2023 18:29:56 +0800
Subject: [PATCH] fix 修复 加解密拦截器 对象属性为null问题
---
ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java | 7 ++++++-
ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java | 8 +++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java
index 6d27ed6..c8baaee 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java
@@ -1,6 +1,7 @@
package org.dromara.common.encrypt.interceptor;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Opt;
import cn.hutool.core.util.ObjectUtil;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.encrypt.annotation.EncryptField;
@@ -75,7 +76,12 @@
Set<Field> fields = encryptorManager.getFieldCache(sourceObject.getClass());
try {
for (Field field : fields) {
- field.set(sourceObject, this.decryptField(String.valueOf(field.get(sourceObject)), field));
+ // 闃叉瀵硅薄涓嶆槸null 灞炴�у唴瀹规槸null
+ Object obj = field.get(sourceObject);
+ if (ObjectUtil.isNull(obj)) {
+ continue;
+ }
+ field.set(sourceObject, this.decryptField(String.valueOf(obj), field));
}
} catch (Exception e) {
log.error("澶勭悊瑙ｅ瘑瀛楁鏃跺嚭閿�", e);
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java
index cf2becb..7698ce1 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java
@@ -84,7 +84,12 @@
Set<Field> fields = encryptorManager.getFieldCache(sourceObject.getClass());
try {
for (Field field : fields) {
- field.set(sourceObject, this.encryptField(String.valueOf(field.get(sourceObject)), field));
+ // 闃叉瀵硅薄涓嶆槸null 灞炴�у唴瀹规槸null
+ Object obj = field.get(sourceObject);
+ if (ObjectUtil.isNull(obj)) {
+ continue;
+ }
+ field.set(sourceObject, this.encryptField(String.valueOf(field.get(obj)), field));
}
} catch (Exception e) {
log.error("澶勭悊鍔犲瘑瀛楁鏃跺嚭閿�", e);
--
Gitblit v1.9.3