Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

@@ -116,8 +116,8 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             List<ImportGeneralDTO> notExistList = groupByBuildingExistStatus.get(false);
             if (!CollectionUtils.isEmpty(notExistList)){
                 // 物业表插入
-                List<String> propertyNames = notExistList.stream().map(m -> m.getPropertyName()).distinct().collect(Collectors.toList());
-                List<String> disposePropertyNames = notExistList.stream().map(m -> m.getPropertyName()).distinct().collect(Collectors.toList());
+                List<String> propertyNames = notExistList.stream().filter(n -> StringUtils.isNotBlank(n.getPropertyName())).map(m -> m.getPropertyName()).distinct().collect(Collectors.toList());
+                List<String> disposePropertyNames = notExistList.stream().filter(n -> StringUtils.isNotBlank(n.getPropertyName())).map(m -> m.getPropertyName()).distinct().collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(propertyNames)){
                     List<String> existPropertyNames = propertyManagementDao.selectExistNames(propertyNames);
                     disposePropertyNames.removeAll(existPropertyNames);