|
@@ -98,16 +98,19 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- List<FileInfo> collect = paramList.stream().map(item -> {
|
|
|
+ List<FileInfo> fileInfoList = new ArrayList<>();
|
|
|
+ for (int i = 0; i < paramList.size(); i++) {
|
|
|
+ FileInfoParam fileInfoParam = paramList.get(i);
|
|
|
FileInfo fileInfo = new FileInfo();
|
|
|
- fileInfo.setId(item.getId());
|
|
|
+ fileInfo.setId(fileInfoParam.getId());
|
|
|
fileInfo.setBusinessId(businessId);
|
|
|
fileInfo.setBusinessType(businessType);
|
|
|
fileInfo.setApplicationName(applicationName);
|
|
|
- return fileInfo;
|
|
|
- }).collect(Collectors.toList());
|
|
|
+ fileInfo.setSort(i);
|
|
|
+ fileInfoList.add(fileInfo);
|
|
|
+ }
|
|
|
|
|
|
- updateBatchById(collect);
|
|
|
+ updateBatchById(fileInfoList);
|
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -133,20 +136,14 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
|
|
|
return fileInfo;
|
|
|
}).collect(Collectors.toList());
|
|
|
|
|
|
- // 如果排除的id数等于提交文件编辑数,则不执行删除逻辑
|
|
|
+ // 如果排除的id数等于提交文件数,则不执行删除逻辑
|
|
|
int excludeIdSize = excludeIdList.size();
|
|
|
- if (paramList.size() != excludeIdSize) {
|
|
|
- remove(Wrappers.<FileInfo>lambdaQuery()
|
|
|
- .eq(FileInfo::getBusinessId, businessId)
|
|
|
- .eq(FileInfo::getBusinessType, businessType)
|
|
|
- .notIn(excludeIdSize > 0, BaseEntity::getId, collect));
|
|
|
- }
|
|
|
-
|
|
|
- // 如果需要添加业务id的文件数为0,跳过提交
|
|
|
- if (collect.size() > 0) {
|
|
|
- updateBatchById(collect);
|
|
|
- }
|
|
|
+ remove(Wrappers.<FileInfo>lambdaQuery()
|
|
|
+ .eq(FileInfo::getBusinessId, businessId)
|
|
|
+ .eq(FileInfo::getBusinessType, businessType)
|
|
|
+ .notIn(excludeIdSize > 0, BaseEntity::getId, excludeIdSize));
|
|
|
|
|
|
+ updateBatchById(collect);
|
|
|
}
|
|
|
|
|
|
@Override
|