小区导入

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

@@ -118,6 +118,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                 // 物业表插入
                 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());
+                if (!CollectionUtils.isEmpty(propertyNames)){
                     List<String> existPropertyNames = propertyManagementDao.selectExistNames(propertyNames);
                     disposePropertyNames.removeAll(existPropertyNames);
                     List<IcPropertyManagementEntity> propertyManagementEntities = new ArrayList<>();
@@ -142,6 +143,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                     neighborHoodService.neighborHoodPropertyInsert(icNeighborHoodPropertyEntities);
                 }
             }
+        }
 
         // 清除
         needDisposeList = new ArrayList<>();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -519,6 +519,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
      * @Author zhaoqifeng
      * @Date 2022/2/14 9:50
      */
+    @Transactional(rollbackFor = Exception.class)
     private String getNeighborHoodId(String customerId, ImportGeneralDTO info) {
         //根据网格ID和小区名获取小区信息
         LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();