From 309a22d0624e8fec46f4b6722ed6135fe0a2ea3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 15:43:51 +0800
Subject: [PATCH] 免单商品的红包处理

---
 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