From ebc9534c93ea341fdbd02ecb84b0e23c89af8ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 4 Aug 2025 17:57:51 +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 --- .../mobilebroken/admin/controller/ProductModelController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 59b5fec2..8b4bd955 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 @@ -628,7 +628,7 @@ public class ProductModelController extends ControllerBase{ String indexName = null; DataFormatter dataFormatter = new DataFormatter(); for (int index = 3, count = sheet.getLastRowNum(); index <= count; index++) { -// log.info("处理第{}行", index); + log.info("处理第{}行", index); Row row = sheet.getRow(index); if (Objects.isNull(row)) { break; @@ -685,7 +685,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()));