From 56e258fa6c23469ea825f6b11d458df9ba577e9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 14:38:50 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index fb1d643..be27d3b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -2286,12 +2286,16 @@
}
}
}
+ }
+
+ if (listSpecial == null) {
+ listSpecial = new ArrayList<Special>();
}
JSONObject root = new JSONObject();
root.put("special", listSpecial);
-
out.print(JsonUtil.loadTrueResult(root));
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0