|
@@ -390,18 +390,20 @@ public class InvoiceApprovalServiceImpl extends ServiceImpl<InvoiceApprovalMappe
|
|
|
CSalesContractSupplementBasicInfo salesContractSupplementBasicInfo = salesContractSupplementBasicInfoService.lambdaQuery()
|
|
|
.eq(CSalesContractSupplementBasicInfo::getcSalesContractSupplementInfoId, s.getId())
|
|
|
.one();
|
|
|
- List<FileStorageDO> SupplementFileStorageDOS = fileService.findByBusinessId(salesContractSupplementBasicInfo.getId(),
|
|
|
- FileModuleDict.ChildEnum.SALES_CONTRACT_SUPPLEMENT_CONTRACT_FILE.getCode());
|
|
|
- if (CollectionUtil.isNotEmpty(SupplementFileStorageDOS)) {
|
|
|
- SupplementFileStorageDOS.forEach(fileStorageDO -> {
|
|
|
- FileStorage fileStorage = new FileStorage();
|
|
|
- fileStorage.setAbsolutePath(fileStorageDO.getAbsolutePath());
|
|
|
- fileStorage.setName(fileStorageDO.getOriginalName());
|
|
|
- fileStorage.setPath(fileStorageDO.getPath());
|
|
|
- fileStorage.setId(fileStorageDO.getId());
|
|
|
- fileStorage.setOriginalName(fileStorageDO.getOriginalName());
|
|
|
- salesContract.add(fileStorage);
|
|
|
- });
|
|
|
+ if(salesContractSupplementBasicInfo != null){
|
|
|
+ List<FileStorageDO> SupplementFileStorageDOS = fileService.findByBusinessId(salesContractSupplementBasicInfo.getId(),
|
|
|
+ FileModuleDict.ChildEnum.SALES_CONTRACT_SUPPLEMENT_CONTRACT_FILE.getCode());
|
|
|
+ if (CollectionUtil.isNotEmpty(SupplementFileStorageDOS)) {
|
|
|
+ SupplementFileStorageDOS.forEach(fileStorageDO -> {
|
|
|
+ FileStorage fileStorage = new FileStorage();
|
|
|
+ fileStorage.setAbsolutePath(fileStorageDO.getAbsolutePath());
|
|
|
+ fileStorage.setName(fileStorageDO.getOriginalName());
|
|
|
+ fileStorage.setPath(fileStorageDO.getPath());
|
|
|
+ fileStorage.setId(fileStorageDO.getId());
|
|
|
+ fileStorage.setOriginalName(fileStorageDO.getOriginalName());
|
|
|
+ salesContract.add(fileStorage);
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
CSalesSupplementSignConfirmation salesSupplementSignConfirmation = salesSupplementSignConfirmationService
|