Compare commits

..

No commits in common. "edd1465d46ac31b494aa1c2bc3aec2f8fd9204f8" and "fb140baeaaeeeebb232caec8924850c3c665afa7" have entirely different histories.

3 changed files with 2858 additions and 7541 deletions

View File

@ -28,8 +28,4 @@ public class I18nUpdateByFileDto {
@NotBlank(message = "多语言key不能为空")
private String fileType;
@Schema(name = "append", title = "文件类型/json/excel")
@NotNull(message = "是否追加")
private Boolean append = true;
}

File diff suppressed because it is too large Load Diff

View File

@ -219,7 +219,6 @@ public class I18nServiceImpl extends ServiceImpl<I18nMapper, I18n> implements I1
String type = dto.getType();
MultipartFile file = dto.getFile();
String fileType = dto.getFileType();
Boolean append = dto.getAppend();
// 判断是否有这个语言的key
List<I18nType> i18nTypeList = i18nTypeMapper.selectList(Wrappers.<I18nType>lambdaQuery().eq(I18nType::getTypeName, type));
@ -236,7 +235,7 @@ public class I18nServiceImpl extends ServiceImpl<I18nMapper, I18n> implements I1
List<Long> ids = i18nList.stream().map(BaseEntity::getId).toList();
// 删除这个类型下所有的多语言
if (!ids.isEmpty() && !append) removeByIds(ids);
if (!ids.isEmpty()) removeByIds(ids);
// 存入内容
if (fileType.equals(FileType.JSON)) {