From e2596c36db88088ad5f28248e5a433af28cbd2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 5 Aug 2025 09:19:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/ProductModelController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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()));