diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java index 9e5f4bfa1..55d2701da 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java @@ -107,32 +107,31 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter mainCategoryEntityList = groupedByFactoryCategoryId.get(factoryCategoryId); - //把mainCategoryEntityList转成以mainName为Key的Map - Map mainCategoryEntityMap = mainCategoryEntityList.stream() - .collect(Collectors.toMap(BasicdataMainCategoryEntity::getMainName, entity -> entity)); - - BasicdataMainCategoryEntity mainCategory = mainCategoryEntityMap.get(mainName); - if (Objects.isNull(mainCategory)){ - mainCategory = new BasicdataMainCategoryEntity(); - mainCategory.setFactoryCategoryId(factoryCategoryId); - } - - mainCategory.setMainName(mainName); - BasicdataMainEntity basicdataMainEntity = mainMap.get(mainName); - if(!Objects.isNull(basicdataMainEntity)){ - mainCategory.setMainId(basicdataMainEntity.getId()); - } - BasicdataCategoryEntity basicdataCategoryEntity = categoryMap.get(mainCategory1); - if(!Objects.isNull(basicdataCategoryEntity)){ - mainCategory.setCategoryId(basicdataCategoryEntity.getId()); - } - mainCategory.setCategory(mainCategory1); - - - newMainCategoryEntities.add(mainCategory); + if(CollUtil.isNotEmpty(mainCategoryEntityList)){ + //把mainCategoryEntityList转成以mainName为Key的Map + Map mainCategoryEntityMap = mainCategoryEntityList.stream() + .collect(Collectors.toMap(BasicdataMainCategoryEntity::getMainName, entity -> entity)); + + BasicdataMainCategoryEntity mainCategory = mainCategoryEntityMap.get(mainName); + if (Objects.isNull(mainCategory)){ + mainCategory = new BasicdataMainCategoryEntity(); + mainCategory.setFactoryCategoryId(factoryCategoryId); + } + mainCategory.setMainName(mainName); + BasicdataMainEntity basicdataMainEntity = mainMap.get(mainName); + if(!Objects.isNull(basicdataMainEntity)){ + mainCategory.setMainId(basicdataMainEntity.getId()); + } + BasicdataCategoryEntity basicdataCategoryEntity = categoryMap.get(mainCategory1); + if(!Objects.isNull(basicdataCategoryEntity)){ + mainCategory.setCategoryId(basicdataCategoryEntity.getId()); + } + mainCategory.setCategory(mainCategory1); + newMainCategoryEntities.add(mainCategory); + } }