|
@@ -1182,7 +1182,9 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- Map<String, List<MappingConfig>> hisMap = list.stream().collect(Collectors.groupingBy(MappingConfig::getHisName));
|
|
|
+ Map<String, List<MappingConfig>> hisMap = list.stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getHisName()))
|
|
|
+ .collect(Collectors.groupingBy(MappingConfig::getHisName));
|
|
|
for (Map.Entry<String, List<MappingConfig>> entry : hisMap.entrySet()) {
|
|
|
Map<String, Map<Long, List<Long>>> subMap = new HashMap<>();
|
|
|
Map<String, List<MappingConfig>> detailMap = entry.getValue().stream()
|
|
@@ -1346,7 +1348,9 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
});
|
|
|
|
|
|
|
|
|
- Map<String, List<MappingConfigWrapper>> map = wrapperList.stream().collect(Collectors.groupingBy(MappingConfigWrapper::getUniqueName));
|
|
|
+ Map<String, List<MappingConfigWrapper>> map = wrapperList.stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .collect(Collectors.groupingBy(MappingConfigWrapper::getUniqueName));
|
|
|
|
|
|
for (Map.Entry<String, List<MappingConfigWrapper>> entry : map.entrySet()) {
|
|
|
Map<String, Map<String, List<String>>> subMap = new HashMap<>();
|