From ca1ad791b7b7b04e57db6bd4fb93f0c1066a9f99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 九月 2020 18:31:23 +0800
Subject: [PATCH] 淘口令格式兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java | 11 +++++------
1 files changed, 5 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 090680e..bf74b96 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
@@ -51,7 +51,7 @@
public void changeSex(AcceptData acceptData, Integer sex, PrintWriter out) {
try {
// 鑾峰彇璁惧瀹氫箟鎬у埆
- deviceSexService.save(acceptData.getDevice(), sex);
+ deviceSexService.save(acceptData.getDevice(), sex);
JSONObject data = new JSONObject();
data.put("sex", sex);
out.print(JsonUtil.loadTrueResult(data));
@@ -65,14 +65,13 @@
* 鑾峰彇瀵艰埅鏍忓唴瀹�
* @param acceptData
* @param uid
- * @param sex 0閫氱敤 1鐢� 2濂�
* @param out
*/
@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);
+ int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice(),acceptData.getSystem());
+ List<HomeNavbar> listNavbar = homeNavbarUserService.listEffectiveNavbar(uid, acceptData.getDevice(), deviceSex,acceptData.getSystem());
List<HomeNavbar> list = new ArrayList<HomeNavbar>();
if (listNavbar != null) {
@@ -109,7 +108,7 @@
List<HomeNavbar> listItems = new ArrayList<HomeNavbar>();
// 绯荤粺榛樿瀵艰埅鏍�
- List<HomeNavbar> listNavbar = homeNavbarService.listQueryEffectiveNavbar();
+ List<HomeNavbar> listNavbar = homeNavbarService.listQueryEffectiveNavbar(acceptData.getSystem());
if (listNavbar != null && listNavbar.size() > 0) {
listItems.addAll(listNavbar);
}
@@ -251,7 +250,7 @@
List<HomeNavbar> listItems = new ArrayList<HomeNavbar>();
- List<HomeNavbar> listNavbar = homeNavbarUserService.restoreSystemDefault(uid, acceptData.getDevice());
+ List<HomeNavbar> listNavbar = homeNavbarUserService.restoreSystemDefault(uid, acceptData.getDevice(),acceptData.getSystem());
if (listNavbar != null && listNavbar.size() > 0) {
listItems.addAll(listNavbar);
}
--
Gitblit v1.8.0