ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(文档拆分): 导入问题修复

Browse Source
This commit is contained in:
yjz
2023-11-10 11:51:16 +08:00
parent 3d02e4b0db
commit 1f596a50c5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+2 -2
View File
@@ -1242,7 +1242,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if (addItemsEOList != null && !addItemsEOList.isEmpty()) { if (addItemsEOList != null && !addItemsEOList.isEmpty()) {
Map<String, Object> oldItems = addItemsEOList.get(addItemsEOList.size()-1); Map<String, Object> oldItems = addItemsEOList.get(addItemsEOList.size()-1);
if (itemNum > 0 && importDto.get("item_num").equals(oldItems.get("item_num")) if (itemNum > 0 && importDto.get("item_num").equals(oldItems.get("item_num"))
&& importDto.get("item_num").equals(oldItems.get("item_title"))) { && importDto.get("item_title").equals(oldItems.get("item_title"))) {
if(ObjectUtil.isEmpty(importDto.get("item_content"))){ if(ObjectUtil.isEmpty(importDto.get("item_content"))){
continue; continue;
} }
@@ -1326,7 +1326,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null); OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null);
// oSSFile = ossFileService.getById(oSSFile.getId()); // oSSFile = ossFileService.getById(oSSFile.getId());
if (oSSFile != null) { if (oSSFile != null) {
oSSFile = ossFileService.getById(oSSFile.getId()); // oSSFile = ossFileService.getById(oSSFile.getId());
isText = false; isText = false;
// BASE64Encoder base64Encoder = new BASE64Encoder(); // BASE64Encoder base64Encoder = new BASE64Encoder();