Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java

@@ -107,6 +107,7 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 					String mainName = datum.getMainName();
 					String mainCategory1 = datum.getMainCategory();
 					List<BasicdataMainCategoryEntity> mainCategoryEntityList = groupedByFactoryCategoryId.get(factoryCategoryId);
+					if(CollUtil.isNotEmpty(mainCategoryEntityList)){
 						//把mainCategoryEntityList转成以mainName为Key的Map
 						Map<String, BasicdataMainCategoryEntity> mainCategoryEntityMap = mainCategoryEntityList.stream()
 							.collect(Collectors.toMap(BasicdataMainCategoryEntity::getMainName, entity -> entity));
@@ -130,9 +131,7 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 
 
 						newMainCategoryEntities.add(mainCategory);
-
-
-
+					}
 
 				}