From 1bcbc66438458a1393591c933243e94f47b7acd2 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 08 三月 2020 11:14:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
utils/src/main/java/org/yeshi/utils/JsonUtil.java | 5 ++++-
1 files changed, 4 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 b348599..d05d734 100644
--- a/utils/src/main/java/org/yeshi/utils/JsonUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/JsonUtil.java
@@ -63,7 +63,10 @@
}
public static String loadJSONP(String callback, String data) {
- return callback + "(" + data + ")";
+ if (StringUtil.isNullOrEmpty(callback))
+ return data;
+ else
+ return callback + "(" + data + ")";
}
public static String loadFalseResult(int code, String error) {
--
Gitblit v1.8.0