From 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 十月 2019 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
utils/src/main/java/org/yeshi/utils/JsonUtil.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/JsonUtil.java b/utils/src/main/java/org/yeshi/utils/JsonUtil.java
index 2d229c5..ff23e1f 100644
--- a/utils/src/main/java/org/yeshi/utils/JsonUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/JsonUtil.java
@@ -271,7 +271,11 @@
List<T> list = new ArrayList<>();
JSONArray array = JSONArray.fromObject(jsonData);
for (int i = 0; i < array.size(); i++) {
- list.add(baseGson.fromJson(array.optJSONObject(i).toString(), beanType));
+ try {
+ list.add(baseGson.fromJson(array.optJSONObject(i).toString(), beanType));
+ } catch (Exception e) {
+ list.add(baseGson.fromJson(array.optString(i), beanType));
+ }
}
return list;
}
--
Gitblit v1.8.0