|
@@ -86,27 +86,27 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
|
|
|
if (tenantMembers.isEmpty()) {
|
|
|
return page.setRecords(tenantMembers);
|
|
|
}
|
|
|
- //设置省市中文名称
|
|
|
- List<Integer> areaCodeList = tenantMembers.stream().map(next -> {
|
|
|
- HashSet<Integer> areaCodes = new HashSet<>();
|
|
|
- areaCodes.add(Integer.valueOf(next.getProvCode()));
|
|
|
- areaCodes.add(Integer.valueOf(next.getAreaCode()));
|
|
|
- areaCodes.add(next.getDistrictCode()!= null?Integer.valueOf(next.getDistrictCode()):null);
|
|
|
- return areaCodes;
|
|
|
- }).flatMap(Collection::stream).filter(Objects::nonNull).distinct().collect(Collectors.toList());
|
|
|
- if (!areaCodeList.isEmpty()) {
|
|
|
- QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.lambda().in(SysArea::getCode, areaCodeList);
|
|
|
-
|
|
|
- Map<Integer, String> codeNameMap = sysAreaMapper.selectList(queryWrapper)
|
|
|
- .stream().collect(Collectors.toMap(SysArea::getCode, SysArea::getName));
|
|
|
-
|
|
|
- tenantMembers.forEach(next -> {
|
|
|
- next.setProvName(codeNameMap.getOrDefault(Integer.valueOf(next.getProvCode()), ""));
|
|
|
- next.setAreaName(codeNameMap.getOrDefault(Integer.valueOf(next.getAreaCode()), ""));
|
|
|
- next.setDistrictName(codeNameMap.getOrDefault(Integer.valueOf(next.getDistrictCode()), ""));
|
|
|
- });
|
|
|
- }
|
|
|
+// //设置省市中文名称
|
|
|
+// List<Integer> areaCodeList = tenantMembers.stream().map(next -> {
|
|
|
+// HashSet<Integer> areaCodes = new HashSet<>();
|
|
|
+// areaCodes.add(Integer.valueOf(next.getProvCode()));
|
|
|
+// areaCodes.add(Integer.valueOf(next.getAreaCode()));
|
|
|
+// areaCodes.add(next.getDistrictCode()!= null?Integer.valueOf(next.getDistrictCode()):null);
|
|
|
+// return areaCodes;
|
|
|
+// }).flatMap(Collection::stream).filter(Objects::nonNull).distinct().collect(Collectors.toList());
|
|
|
+// if (!areaCodeList.isEmpty()) {
|
|
|
+// QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>();
|
|
|
+// queryWrapper.lambda().in(SysArea::getCode, areaCodeList);
|
|
|
+//
|
|
|
+// Map<Integer, String> codeNameMap = sysAreaMapper.selectList(queryWrapper)
|
|
|
+// .stream().collect(Collectors.toMap(SysArea::getCode, SysArea::getName));
|
|
|
+//
|
|
|
+// tenantMembers.forEach(next -> {
|
|
|
+// next.setProvName(codeNameMap.getOrDefault(Integer.valueOf(next.getProvCode()), ""));
|
|
|
+// next.setAreaName(codeNameMap.getOrDefault(Integer.valueOf(next.getAreaCode()), ""));
|
|
|
+// next.setDistrictName(codeNameMap.getOrDefault(Integer.valueOf(next.getDistrictCode()), ""));
|
|
|
+// });
|
|
|
+// }
|
|
|
return page.setRecords(tenantMembers);
|
|
|
}
|
|
|
|