From 067029eebe79b39451f4683e99cf32205a579e6a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 九月 2021 17:06:18 +0800
Subject: [PATCH] update 优化分页工具排序处理
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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..676de01 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,7 +1,6 @@
package com.ruoyi.common.utils;
import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,6 +31,9 @@
}
public static String toJsonString(Object object) {
+ if (StringUtils.isNull(object)) {
+ return null;
+ }
try {
return objectMapper.writeValueAsString(object);
} catch (JsonProcessingException e) {
@@ -40,7 +42,7 @@
}
public static <T> T parseObject(String text, Class<T> clazz) {
- if (StrUtil.isEmpty(text)) {
+ if (StringUtils.isEmpty(text)) {
return null;
}
try {
@@ -62,6 +64,9 @@
}
public static <T> T parseObject(String text, TypeReference<T> typeReference) {
+ if (StringUtils.isBlank(text)) {
+ return null;
+ }
try {
return objectMapper.readValue(text, typeReference);
} catch (IOException e) {
@@ -70,6 +75,9 @@
}
public static <T> Map<String, T> parseMap(String text) {
+ if (StringUtils.isBlank(text)) {
+ return null;
+ }
try {
return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {});
} catch (IOException e) {
@@ -78,7 +86,7 @@
}
public static <T> List<T> parseArray(String text, Class<T> clazz) {
- if (StrUtil.isEmpty(text)) {
+ if (StringUtils.isEmpty(text)) {
return new ArrayList<>();
}
try {
--
Gitblit v1.9.3