From 55546dfc80bd2ec1be8786b19f53df4e1c1e44e5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 七月 2021 13:49:47 +0800
Subject: [PATCH] 发布 v2.5.1 针对 v2.5.0 版本新特性bug修复
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
index 2607636..ae6cc11 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.utils;
+import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -32,6 +33,9 @@
}
public static String toJsonString(Object object) {
+ if (Validator.isEmpty(object)) {
+ return null;
+ }
try {
return objectMapper.writeValueAsString(object);
} catch (JsonProcessingException e) {
@@ -62,6 +66,9 @@
}
public static <T> T parseObject(String text, TypeReference<T> typeReference) {
+ if (StrUtil.isBlank(text)) {
+ return null;
+ }
try {
return objectMapper.readValue(text, typeReference);
} catch (IOException e) {
@@ -70,6 +77,9 @@
}
public static <T> Map<String, T> parseMap(String text) {
+ if (StrUtil.isBlank(text)) {
+ return null;
+ }
try {
return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {});
} catch (IOException e) {
--
Gitblit v1.9.3