From acd2b6eaf5ebd1a9d5aa1f54a741dfa6fc52ac10 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 27 十一月 2018 17:51:01 +0800
Subject: [PATCH] Merge branch 'dev1'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 9dfd6e0..6288178 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
@@ -432,11 +432,11 @@
historySearchService.addHistorySearch(kw, bid);
-// System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
-// if (system == null) {
-// out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
-// return;
-// }
+ System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
if (!StringUtil.isNullOrEmpty(kw) && (kw.startsWith("http://") || kw.startsWith("https://"))) {
out.print(JsonUtil.loadFalseResult("鏃犳硶鎼滅储閾炬帴"));
--
Gitblit v1.8.0