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

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

@@ -131,6 +131,23 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 
 
 						newMainCategoryEntities.add(mainCategory);
+					}else{
+						BasicdataMainCategoryEntity 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);
+
 					}
 
 				}