diff --git a/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java b/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java index 09e4203e..c03c5bb5 100644 --- a/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java +++ b/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java @@ -48,5 +48,4 @@ public CorsFilter corsFilter() source.registerCorsConfiguration("/**", corsConfiguration); return new CorsFilter(source); } - -} \ No newline at end of file +} diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImpl.java index 51f0f372..f9e172fe 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImpl.java @@ -414,17 +414,15 @@ public FileResult bulkInsertOrUpdate(List entries) { int addNum = 0; int updateNum = 0; for (I18nEntry entry : entries) { - // 构建查询条件,假设 key 作为唯一键 // 查询数据库中是否存在该记录 - I18nEntryDto existingEntry = i18nEntryMapper.findI18nEntriesByKeyAndLang(entry.getKey(), entry.getLang()); - - if (existingEntry == null) { + List i18nEntryList = i18nEntryMapper.queryI18nEntryByCondition(entry); + if (i18nEntryList.isEmpty()) { // 插入新记录 i18nEntryMapper.createI18nEntry(entry); addNum = addNum + 1; } else { // 更新记录 - entry.setId(existingEntry.getId()); + entry.setId(i18nEntryList.get(0).getId()); i18nEntryMapper.updateI18nEntryById(entry); updateNum = updateNum + 1; }