f6e6517d by 荆蔚杰

目录保存修改逻辑调整

1 parent d4499e93
...@@ -250,7 +250,10 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi ...@@ -250,7 +250,10 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
250 List<UpdateDgArchivesCatalogRequest> updateCatalogs = requests.stream().filter(item -> !StrUtil.isNullOrUndefined(item.getBsmCatalog())).collect(Collectors.toList()); 250 List<UpdateDgArchivesCatalogRequest> updateCatalogs = requests.stream().filter(item -> !StrUtil.isNullOrUndefined(item.getBsmCatalog())).collect(Collectors.toList());
251 List<UpdateDgArchivesCatalogRequest> addCatalogs = requests.stream().filter(item -> StrUtil.isNullOrUndefined(item.getBsmCatalog())).collect(Collectors.toList()); 251 List<UpdateDgArchivesCatalogRequest> addCatalogs = requests.stream().filter(item -> StrUtil.isNullOrUndefined(item.getBsmCatalog())).collect(Collectors.toList());
252 252
253 boolean flag = false;
254
253 //存量数据更新. 255 //存量数据更新.
256 if (updateCatalogs.size() != 0) {
254 String bsmArchive = updateCatalogs.stream().map(UpdateDgArchivesCatalogRequest::getBsmArchives).findFirst().orElse(null); 257 String bsmArchive = updateCatalogs.stream().map(UpdateDgArchivesCatalogRequest::getBsmArchives).findFirst().orElse(null);
255 QueryWrapper<DgArchivesCatalogDO> catalogWrapper = new QueryWrapper<>(); 258 QueryWrapper<DgArchivesCatalogDO> catalogWrapper = new QueryWrapper<>();
256 catalogWrapper.lambda().eq(DgArchivesCatalogDO::getBsmArchives, bsmArchive); 259 catalogWrapper.lambda().eq(DgArchivesCatalogDO::getBsmArchives, bsmArchive);
...@@ -270,12 +273,13 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi ...@@ -270,12 +273,13 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
270 catalogService.remove(catalogWrapper); 273 catalogService.remove(catalogWrapper);
271 } 274 }
272 List<DgArchivesCatalogDO> updateCatalogDOs = catalogConverter.updateList2DO(updateCatalogs); 275 List<DgArchivesCatalogDO> updateCatalogDOs = catalogConverter.updateList2DO(updateCatalogs);
273 boolean flag = catalogService.updateBatchById(updateCatalogDOs); 276 flag = catalogService.updateBatchById(updateCatalogDOs);
277 }
274 278
275 if (addCatalogs.size() != 0) { 279 if (addCatalogs.size() != 0) {
276 //新增数据 280 //新增数据
277 List<DgArchivesCatalogDO> addCatalogDOs = catalogConverter.updateList2DO(addCatalogs); 281 List<DgArchivesCatalogDO> addCatalogDOs = catalogConverter.updateList2DO(addCatalogs);
278 return catalogService.saveBatch(addCatalogDOs); 282 flag = catalogService.saveBatch(addCatalogDOs);
279 } 283 }
280 return flag; 284 return flag;
281 285
......