ffb9f9d6 by 荆蔚杰

档案目录修改保存判断方式修改

1 parent 76e562c9
1 package com.pashanhoo.archive.service.impl; 1 package com.pashanhoo.archive.service.impl;
2 2
3 import cn.hutool.core.util.StrUtil;
3 import com.baomidou.mybatisplus.core.metadata.IPage; 4 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 import com.pashanhoo.archive.entity.DgArchivesConverter; 6 import com.pashanhoo.archive.entity.DgArchivesConverter;
...@@ -246,8 +247,8 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi ...@@ -246,8 +247,8 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
246 @Transactional(rollbackFor = Exception.class) 247 @Transactional(rollbackFor = Exception.class)
247 public boolean updateCatalog(List<UpdateDgArchivesCatalogRequest> requests) { 248 public boolean updateCatalog(List<UpdateDgArchivesCatalogRequest> requests) {
248 249
249 List<UpdateDgArchivesCatalogRequest> updateCatalogs = requests.stream().filter(item -> !item.getBsmCatalog().isEmpty()).collect(Collectors.toList()); 250 List<UpdateDgArchivesCatalogRequest> updateCatalogs = requests.stream().filter(item -> !StrUtil.isNullOrUndefined(item.getBsmCatalog())).collect(Collectors.toList());
250 List<UpdateDgArchivesCatalogRequest> addCatalogs = requests.stream().filter(item -> item.getBsmCatalog().isEmpty()).collect(Collectors.toList()); 251 List<UpdateDgArchivesCatalogRequest> addCatalogs = requests.stream().filter(item -> StrUtil.isNullOrUndefined(item.getBsmCatalog())).collect(Collectors.toList());
251 252
252 //存量数据更新. 253 //存量数据更新.
253 String bsmArchive = updateCatalogs.stream().map(UpdateDgArchivesCatalogRequest::getBsmArchives).findFirst().orElse(null); 254 String bsmArchive = updateCatalogs.stream().map(UpdateDgArchivesCatalogRequest::getBsmArchives).findFirst().orElse(null);
......