fix: 修复一个错误
This commit is contained in:
parent
039df14299
commit
ebc9534c93
|
|
@ -628,7 +628,7 @@ public class ProductModelController extends ControllerBase{
|
||||||
String indexName = null;
|
String indexName = null;
|
||||||
DataFormatter dataFormatter = new DataFormatter();
|
DataFormatter dataFormatter = new DataFormatter();
|
||||||
for (int index = 3, count = sheet.getLastRowNum(); index <= count; index++) {
|
for (int index = 3, count = sheet.getLastRowNum(); index <= count; index++) {
|
||||||
// log.info("处理第{}行", index);
|
log.info("处理第{}行", index);
|
||||||
Row row = sheet.getRow(index);
|
Row row = sheet.getRow(index);
|
||||||
if (Objects.isNull(row)) {
|
if (Objects.isNull(row)) {
|
||||||
break;
|
break;
|
||||||
|
|
@ -685,7 +685,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()));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue