From dedd7eb1a3ee59fdc51a27ae29373ae3b84805bb Mon Sep 17 00:00:00 2001
From: andanyang <1218853253@qq.com>
Date: Wed, 9 Aug 2023 17:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dfastjson=20=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=A3=85=E6=8D=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/admin4j/json/FastjsonJSONMapper.java  | 6 +++++-
 .../src/main/java/com/admin4j/json/Fastjson2JSONMapper.java | 6 +++++-
 pom.xml                                                     | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java b/admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java
index fc21f3d..90ac551 100644
--- a/admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java
+++ b/admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java
@@ -61,7 +61,11 @@ public <T> List<T> getArray(String key, Class<T> tClass) {
         JSONArray jsonArray = jsonObject.getJSONArray(key);
         List<T> jsonMappers = new ArrayList<>(jsonArray.size());
         for (Object jsonObject : jsonArray) {
-            jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
+            if (jsonObject instanceof JSONObject) {
+                jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
+            } else {
+                jsonMappers.add((T) jsonObject);
+            }
         }
         return jsonMappers;
     }
diff --git a/admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java b/admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java
index 0a7bad9..3ec3007 100644
--- a/admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java
+++ b/admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java
@@ -58,7 +58,11 @@ public <T> List<T> getArray(String key, Class<T> tClass) {
         JSONArray jsonArray = jsonObject.getJSONArray(key);
         List<T> jsonMappers = new ArrayList<>(jsonArray.size());
         for (Object jsonObject : jsonArray) {
-            jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
+            if (jsonObject instanceof JSONObject) {
+                jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
+            } else {
+                jsonMappers.add((T) jsonObject);
+            }
         }
         return jsonMappers;
     }
diff --git a/pom.xml b/pom.xml
index 8770ef9..82b3557 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
     </scm>
 
     <properties>
-        <revision>0.7.0</revision>
+        <revision>0.7.1</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>