无车优化，自有车接口返回

src/main/java/com/jkcredit/invoice/service/lowerservice/impl/NoCarServiceImpl.java

@@ -357,8 +357,10 @@ public class NoCarServiceImpl implements NoCarService {
         waybillStartRequest.setCompanyName(noCarWayBill.getCompanyName());
         if(noCarWayBill.getBase64Str() == null){
            NoCarWayBillFileInfo noCarWayBillFileInfo =  wayBillFileMapper.selectFileInfo(noCarWayBill.getFileBatchNum(),noCarWayBill.getBillNum());
-           waybillStartRequest.setWaybillFileName(noCarWayBillFileInfo.getWayBillNum());
-           waybillStartRequest.setBase64Str(noCarWayBillFileInfo.getBase64Str());
+           if(noCarWayBillFileInfo!=null){
+               waybillStartRequest.setWaybillFileName(noCarWayBillFileInfo.getFileName());
+               waybillStartRequest.setBase64Str(noCarWayBillFileInfo.getBase64Str());
+           }
         }else {
             waybillStartRequest.setWaybillFileName(noCarWayBill.getWaybillFileName());
             waybillStartRequest.setBase64Str(noCarWayBill.getBase64Str());
@@ -598,9 +600,12 @@ public class NoCarServiceImpl implements NoCarService {
         waybillStartRequest.setBankAccount(noCarWayBill.getCompanyBankAcc());
         if(noCarWayBill.getBase64Str() == null){
             NoCarWayBillFileInfo noCarWayBillFileInfo =  wayBillFileMapper.selectFileInfo(noCarWayBill.getFileBatchNum(),noCarWayBill.getBillNum());
-            waybillStartRequest.setWaybillFileName(noCarWayBillFileInfo.getWayBillNum());
-            waybillStartRequest.setBase64Str(noCarWayBillFileInfo.getBase64Str());
-            waybillStartRequest.setContractType(noCarWayBill.getContractType());
+            if(noCarWayBillFileInfo!=null){
+                waybillStartRequest.setWaybillFileName(noCarWayBillFileInfo.getFileName());
+                waybillStartRequest.setBase64Str(noCarWayBillFileInfo.getBase64Str());
+                waybillStartRequest.setContractType(noCarWayBill.getContractType());
+            }
+
         }else {
             waybillStartRequest.setWaybillFileName(noCarWayBill.getWaybillFileName());
             waybillStartRequest.setBase64Str(noCarWayBill.getBase64Str());