From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java
index 4feeaef..72c23e8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java
@@ -69,15 +69,12 @@
*/
@RequestMapping(value = "getHomeItems", method = RequestMethod.POST)
public void getHomeItems(AcceptData acceptData, Long uid, PrintWriter out) {
-
// 鑾峰彇璁惧瀹氫箟鎬у埆
int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice());
-
List<HomeNavbar> listNavbar = homeNavbarUserService.listEffectiveNavbar(uid, acceptData.getDevice(), deviceSex);
if (listNavbar == null) {
listNavbar = new ArrayList<HomeNavbar>();
- }
-
+ }
JSONObject data = new JSONObject();
data.put("sex", deviceSex);
data.put("count", listNavbar.size());
--
Gitblit v1.8.0