From 10e423b5a82eca7ad670435ba079f1fe74eac4d9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 八月 2019 11:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HomeNavbarController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HomeNavbarController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HomeNavbarController.java
index 88feae6..68cfc68 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HomeNavbarController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HomeNavbarController.java
@@ -13,6 +13,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;
+import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar.NavbarTypeEnum;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
import net.sf.json.JSONObject;
@@ -33,16 +34,25 @@
*/
@RequestMapping(value = "gethomenavbar", method = RequestMethod.POST)
public void gethomenavbar(AcceptData acceptData, PrintWriter out) {
+
+ List<HomeNavbar> list = new ArrayList<HomeNavbar>();
+
List<HomeNavbar> listNavbar = homeNavbarService.listQueryDefaultNavbar(0);
- if (listNavbar == null) {
- listNavbar = new ArrayList<HomeNavbar>();
+ if (listNavbar != null) {
+ list.addAll(listNavbar);
+ }
+
+ 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("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