From ae13606635f7f7bf52be970329d215f96a22e2f9 Mon Sep 17 00:00:00 2001
From: fanshuai <1141904845@qq.com>
Date: Mon, 3 Jun 2024 16:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E6=8D=A2=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/platform/utils/JacksonUtil.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JacksonUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JacksonUtil.java
index b413db9..5de227d 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JacksonUtil.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JacksonUtil.java
@@ -5,9 +5,11 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.type.CollectionType;
+import com.ruoyi.common.core.utils.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -140,6 +142,7 @@ public class JacksonUtil {
      */
     public static Map<String, Object> parseJSONStr2Map(String jsonStr) {
         try {
+            if (StringUtils.isEmpty(jsonStr)) {return new HashMap<String, Object>();}
             // 对于json字符串新增的字段，由于返回的是map，不管 compatNewProps 设置成什么值都不会抛出异常
             ObjectMapper objectMapper = getObjectMapper(null, false, false, true);
             return objectMapper.readValue(jsonStr, Map.class);
@@ -158,6 +161,7 @@ public class JacksonUtil {
      */
     public static List<Map<String, Object>> parseJSONStr2MapList(String jsonStr) {
         try {
+            if (StringUtils.isEmpty(jsonStr)) {return new ArrayList<>();}
             // 对于json字符串新增的字段，由于返回的是map，不管 compatNewProps 设置成什么值都不会抛出异常
             ObjectMapper objectMapper = getObjectMapper(null, false, false, true);
             CollectionType listType = objectMapper.getTypeFactory().constructCollectionType(ArrayList.class, Map.class);