From a0a5b70e0d0df9357d09542f20dc6633a986f328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 六月 2019 11:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarUserServiceImpl.java | 86 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarUserServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarUserServiceImpl.java
index 2595074..3e180c1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarUserServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarUserServiceImpl.java
@@ -30,57 +30,67 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+
@Override
- public List<HomeNavbar> listEffectiveNavbar(Long uid, String device) {
+ public List<HomeNavbar> listEffectiveNavbar(Long uid, String device, Integer sex) {
List<HomeNavbar> list = new ArrayList<HomeNavbar>();
- if (uid != null || !StringUtil.isNullOrEmpty(device)) {
- if (uid != null) {
- device = null;
- }
-
- // 鑷畾涔夊鑸�
- List<HomeNavbarUser> listUserNavbar = homeNavbarUserMapper.listEffectiveNavbars(uid, device);
-
- if (listUserNavbar != null && listUserNavbar.size() > 0) {
- // 鍥哄畾瀵艰埅
- List<HomeNavbar> listFixed = homeNavbarService.listQueryFixedNavbar();
- if (listFixed != null && listFixed.size() > 0) {
- list.addAll(listFixed);
+ if (sex == null || sex == 0) {
+ if (uid != null || !StringUtil.isNullOrEmpty(device)) {
+ if (uid != null) {
+ device = null;
}
+ // 鑷畾涔夊鑸�
+ List<HomeNavbarUser> listUserNavbar = homeNavbarUserMapper.listEffectiveNavbars(uid, device);
- // 閬嶅巻鐢ㄦ埛鑷畾涔�
- for (HomeNavbarUser uomeNavbarUser : listUserNavbar) {
- HomeNavbar homeNavbar = uomeNavbarUser.getHomeNavbar();
- if (homeNavbar == null) {
- continue;
- }
-
- // 鏄惁鏄浐瀹氶」
- boolean notExist = true;
-
+ if (listUserNavbar != null && listUserNavbar.size() > 0) {
+ // 鍥哄畾瀵艰埅
+ List<HomeNavbar> listFixed = homeNavbarService.listQueryFixedNavbar();
if (listFixed != null && listFixed.size() > 0) {
- long id = homeNavbar.getId();
- for (HomeNavbar fixedbar : listFixed) {
- long fixedId = fixedbar.getId();
- if (fixedId == id) {
- notExist = false;
- listFixed.remove(fixedbar);
- break;
+ list.addAll(listFixed);
+ }
+
+ // 閬嶅巻鐢ㄦ埛鑷畾涔�
+ for (HomeNavbarUser uomeNavbarUser : listUserNavbar) {
+ HomeNavbar homeNavbar = uomeNavbarUser.getHomeNavbar();
+ if (homeNavbar == null) {
+ continue;
+ }
+
+ // 鏄惁鏄浐瀹氶」
+ boolean notExist = true;
+
+ if (listFixed != null && listFixed.size() > 0) {
+ long id = homeNavbar.getId();
+ for (HomeNavbar fixedbar : listFixed) {
+ long fixedId = fixedbar.getId();
+ if (fixedId == id) {
+ notExist = false;
+ listFixed.remove(fixedbar);
+ break;
+ }
}
}
- }
- if (notExist) {
- list.add(homeNavbar);
+ if (notExist) {
+ list.add(homeNavbar);
+ }
}
}
}
- }
-
- if (list.size() == 0) {
- list = homeNavbarService.listQueryDefaultNavbar();
+
+ if (list.size() == 0) {
+ List<HomeNavbar> listDefault = homeNavbarService.listQueryDefaultNavbar(sex);
+ if (listDefault != null) {
+ list.addAll(listDefault);
+ }
+ }
+ } else {
+ List<HomeNavbar> listDefault = homeNavbarService.listQueryDefaultNavbar(sex);
+ if (listDefault != null) {
+ list.addAll(listDefault);
+ }
}
return list;
}
--
Gitblit v1.8.0