From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java
index c67578b..5437a63 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java
@@ -42,17 +42,8 @@
* @throws HomeNavbarException
* @throws Exception
*/
- public void updateOrder(Long id, Integer moveType) throws HomeNavbarException, Exception;
+ public void updateOrder(Long id, Integer moveType, Integer sex) throws HomeNavbarException, Exception;
-
- /**
- * 鍚庣鍒楄〃鏌ヨ-鍚屾椂super
- * @param start
- * @param count
- * @param key
- * @return
- */
- public List<HomeNavbar> listQueryAndBusinessSystem(long start, int count, String key);
/**
* 鍚庣鏌ヨ
@@ -61,16 +52,16 @@
* @param key
* @return
*/
- public List<HomeNavbar> listQuery(long start, int count, String key);
+ public List<HomeNavbar> listQuery(long start, int count, String key, Integer sex);
- public long countlistQuery(String key);
+ public long countlistQuery(String key, Integer sex);
/**
* 鏌ヨ鏈夋晥瀵艰埅鏍�
* @return
*/
- public List<HomeNavbar> listQueryEffective();
+ public List<HomeNavbar> listQueryEffectiveNavbar();
/**
* 鏍规嵁鍒嗙被鏌ヨ鏈夋晥瀵艰埅鏍�
@@ -78,5 +69,25 @@
* @return
*/
public HomeNavbar getEffectiveByClassId(@Param("classId") Long classId);
+
+
+ /**
+ * 榛樿瀵艰埅鏍�
+ * @return
+ */
+ public List<HomeNavbar> listQueryDefaultNavbar(Integer sex);
+
+ /**
+ * 鍥哄畾鐨勫鑸爮
+ * @return
+ */
+ public List<HomeNavbar> listQueryFixedNavbar();
+
+ /**
+ * 鏀瑰彉鐘舵��
+ * @param id
+ * @throws HomeNavbarException
+ */
+ public void switchState(Long id) throws HomeNavbarException;
}
--
Gitblit v1.8.0