diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java index 8b4bd955..5ae2d7ab 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java @@ -643,6 +643,9 @@ public class ProductModelController extends ControllerBase{ indexName=dto.getIndexName(); } Cell cell1=row.getCell(1); + if ((Objects.isNull(cell1) || StrUtil.isBlank(cell1.getStringCellValue()))){ + break; + } dto.setName(StrUtil.trim(cell1.getStringCellValue())); Cell cell2=row.getCell(2); dto.setValue(StrUtil.trim(dataFormatter.formatCellValue(cell2))); @@ -739,7 +742,7 @@ public class ProductModelController extends ControllerBase{ .setCreateBy(AdminUserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); if (StrUtil.equals(language.getCode(), "sa") || StrUtil.equals(language.getCode(), "de")) { - ProductModelParamsItem en = items.stream().filter(it -> StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get(); + ProductModelParamsItem en = items.stream().filter(it ->StrUtil.equals(it.getBatchNumber(), cn.getBatchNumber()) && StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get(); item.setIndexName(translate.translateWord(en.getIndexName(), language.getTranslateCode())); item.setName(translate.translateWord(en.getName(), language.getTranslateCode())); item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode()));