From a6673284d4ec0b7c11079c65d940c9443d86d11e Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 15:21:48 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java
index 2b8c4d1..2b0fd24 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java
@@ -258,7 +258,7 @@
System system = systemService.getById(systemId);
List<SuperHotSearch> list = superHotSearchService.getHotSearchSystem(id, systemId);
if (list == null || list.size() == 0) {
- superHotSearchService.addSuper(systemId, system);
+ superHotSearchService.addSuper(id, system);
JSONObject data = new JSONObject();
data.put("check", 1);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -271,7 +271,7 @@
} else {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼澶辫触"));
}
- }
+ }
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼寮傚父"));
--
Gitblit v1.8.0