From 3b76ea61a383e4191705ff2af84bd1dfafbe553f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:36:57 +0800
Subject: [PATCH] 导航栏加入通用跳转

---
 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