From c8041ec0544bf122e6819e6bf698997ccbf30aaf Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 10 十二月 2019 15:32:34 +0800
Subject: [PATCH] 小黄条
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HomeNavbarController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 72caee2..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> listNavbar = homeNavbarService.listQueryDefaultNavbar();
- if (listNavbar == null) {
- listNavbar = new ArrayList<HomeNavbar>();
+
+ List<HomeNavbar> list = new ArrayList<HomeNavbar>();
+
+ List<HomeNavbar> listNavbar = homeNavbarService.listQueryDefaultNavbar(0);
+ 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