|
@@ -81,7 +81,7 @@ public class TabService {
|
|
|
// 非中国地域不返回地域Tab
|
|
// 非中国地域不返回地域Tab
|
|
|
if (isChinaRegion(tabParam.getProvinceCode())) {
|
|
if (isChinaRegion(tabParam.getProvinceCode())) {
|
|
|
String province = tabParam.getProvince().replaceAll("省$", "");
|
|
String province = tabParam.getProvince().replaceAll("省$", "");
|
|
|
- List<TabProto> provinceTab = this.buildTabProto(Collections.singletonList(province), TabSource.other, TabType.territory, tabs);
|
|
|
|
|
|
|
+ List<TabProto> provinceTab = this.buildTabProto(Collections.singletonList(province), tabParam.getUnionId(), TabSource.other, TabType.territory, tabs);
|
|
|
tabProtos.addAll(provinceTab);
|
|
tabProtos.addAll(provinceTab);
|
|
|
}
|
|
}
|
|
|
return tabProtos;
|
|
return tabProtos;
|
|
@@ -89,7 +89,7 @@ public class TabService {
|
|
|
|
|
|
|
|
private List<TabProto> personalizationTab(TabParam tabParam, Set<String> tabs) {
|
|
private List<TabProto> personalizationTab(TabParam tabParam, Set<String> tabs) {
|
|
|
|
|
|
|
|
- List<TabProto> defaultTab = this.buildTabProto(homepageDefaultTab, TabSource.default_hot, TabType.personalization, tabs);
|
|
|
|
|
|
|
+ List<TabProto> defaultTab = this.buildTabProto(homepageDefaultTab, tabParam.getUnionId(), TabSource.default_hot, TabType.personalization, tabs);
|
|
|
List<TabProto> tabProtos = new ArrayList<>(defaultTab);
|
|
List<TabProto> tabProtos = new ArrayList<>(defaultTab);
|
|
|
|
|
|
|
|
if (StringUtils.isBlank(tabParam.getUnionId())) {
|
|
if (StringUtils.isBlank(tabParam.getUnionId())) {
|