From e021e32a6ff0ec216f69c24f7ea929798bdce4c5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 十一月 2019 11:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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..1119648 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
@@ -22,6 +22,7 @@
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import net.sf.json.JSONObject;
@@ -69,19 +70,29 @@
*/
@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>();
+
+ List<HomeNavbar> list = new ArrayList<HomeNavbar>();
+ if (listNavbar != null) {
+ list.addAll(listNavbar);
+ }
+
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ for (int i = 0; i < list.size(); i ++) {
+ NavbarTypeEnum type = list.get(i).getType();
+ if (type == NavbarTypeEnum.commonTemplate) {
+ list.remove(i);
+ i--;
+ }
+ }
}
JSONObject data = new JSONObject();
data.put("sex", deviceSex);
- data.put("count", listNavbar.size());
- data.put("listNavbar", JsonUtil.getApiCommonGson().toJson(listNavbar));
+ data.put("count", list.size());
+ data.put("listNavbar", JsonUtil.getApiCommonGson().toJson(list));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0