From 5797fc7e8267d634ee64fd27cdea2a834091681e Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 15 一月 2019 11:10:24 +0800 Subject: [PATCH] Merge branch 'master' into dev-msg --- fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java index 902613e..30bae77 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java @@ -480,7 +480,8 @@ } Gson gson = new GsonBuilder().create(); - data.put("words", gson.toJson(listRecommendWords)); + if (data != null) + data.put("words", gson.toJson(listRecommendWords)); out.print(JsonUtil.loadTrueResult(data)); } -- Gitblit v1.8.0