rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复一个错误

This commit is contained in:
曹鹏飞 2025-08-05 09:19:47 +08:00
parent 238fa02f7d
commit 477744c5ed
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
View File

@ -643,6 +643,9 @@ public class ProductModelController extends ControllerBase{
indexName=dto.getIndexName(); indexName=dto.getIndexName();
} }
Cell cell1=row.getCell(1); Cell cell1=row.getCell(1);
if ((Objects.isNull(cell1) || StrUtil.isBlank(cell1.getStringCellValue()))){
break;
}
dto.setName(StrUtil.trim(cell1.getStringCellValue())); dto.setName(StrUtil.trim(cell1.getStringCellValue()));
Cell cell2=row.getCell(2); Cell cell2=row.getCell(2);
dto.setValue(StrUtil.trim(dataFormatter.formatCellValue(cell2))); dto.setValue(StrUtil.trim(dataFormatter.formatCellValue(cell2)));
@ -739,7 +742,7 @@ public class ProductModelController extends ControllerBase{
.setCreateBy(AdminUserUtil.getUserName()) .setCreateBy(AdminUserUtil.getUserName())
.setCreateTime(LocalDateTime.now()); .setCreateTime(LocalDateTime.now());
if (StrUtil.equals(language.getCode(), "sa") || StrUtil.equals(language.getCode(), "de")) { 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.setIndexName(translate.translateWord(en.getIndexName(), language.getTranslateCode()));
item.setName(translate.translateWord(en.getName(), language.getTranslateCode())); item.setName(translate.translateWord(en.getName(), language.getTranslateCode()));
item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode())); item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode()));