Merge remote-tracking branch 'origin/smb' into smb

src/main/java/com/sunxung/factoring/service/financing/contract/impl/ContractMakingServiceImpl.java

@@ -1009,7 +1009,7 @@ public class ContractMakingServiceImpl implements ContractMakingService {
         List<SmbContractInfo> smbContractInfos = new ArrayList<>();
         ContractInfo contractInfo = contractInfoService.getById(contractInfoId);
         ReviewFinancingInfo reviewFinancingInfo = reviewFinancingInfoService.lambdaQuery().eq(ReviewFinancingInfo::getReviewQuotaDisburseId, contractInfo.getReviewQuotaDisburseId()).one();
-        if (ConstantUtil.JIANGSU_SUSHANG_BANK.equals(reviewFinancingInfo.getInstitutionName())) {
+        if (reviewFinancingInfo != null && ConstantUtil.JIANGSU_SUSHANG_BANK.equals(reviewFinancingInfo.getInstitutionName())) {
             ReviewQuotaDisburse reviewQuotaDisburse = reviewQuotaDisburseService.getById(reviewFinancingInfo.getReviewQuotaDisburseId());
             CFinancingBasicInfo cFinancingBasicInfo = financingBasicInfoService.getById(reviewQuotaDisburse.getFinancingBasicInfoId());
             SupplierInfo supplierInfo = supplierInfoService.getByEnterpriseId(cFinancingBasicInfo.getMainEnterpriseId());

src/main/java/com/sunxung/factoring/service/financing/payment/impl/PaymentApplyServiceImpl.java

@@ -636,6 +636,7 @@ public class PaymentApplyServiceImpl extends ServiceImpl<PaymentApplyMapper, Pay
                     fileStorage.setPath(fileStorageDO.getPath());
                     fileStorage.setId(fileStorageDO.getId());
                     fileStorage.setOriginalName(fileStorageDO.getOriginalName());
+                    fileStorage.setType(fileStorageDO.getType());
                     salesContractFileList.add(fileStorage);
                 });
             }