|
|
@@ -70,7 +70,7 @@ public class TabService {
|
|
|
List<TabProto> territoryTabs = this.territoryTab(tabParam, tabs);
|
|
|
|
|
|
// 地域Tab
|
|
|
- if (CollectionUtils.isNotEmpty(territoryTabs)){
|
|
|
+ if (CollectionUtils.isNotEmpty(territoryTabs)) {
|
|
|
tabProtos.addAll(territoryTabs);
|
|
|
}
|
|
|
|
|
|
@@ -92,6 +92,7 @@ public class TabService {
|
|
|
if (isChinaRegion(tabParam.getProvinceCode())) {
|
|
|
String province = tabParam.getProvince().replaceAll("省$", "");
|
|
|
List<TabProto> provinceTab = this.buildTabProto(Collections.singletonList(province), tabParam.getUnionId(), TabSource.other, TabType.territory, tabs);
|
|
|
+ provinceTab = provinceTab.stream().map(i -> i.toBuilder().setTitle("同城").build()).collect(Collectors.toList());
|
|
|
tabProtos.addAll(provinceTab);
|
|
|
}
|
|
|
return tabProtos;
|