Merge remote-tracking branch 'origin/master'

src/main/java/com/jkcredit/invoice/credit/interserver/NoCarInterServiceImpl.java

@@ -371,7 +371,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setContractType(contractType);
            DataResult dataResult = getDataResult(appKey, data, costtimestart, result, customerRec, noCarWayBill);
             try {
-                if(dataResult.getCode() == 0){
+                if(dataResult.getCode() == 0 && StringUtils.isNotBlank(waybillFileName) && StringUtils.isNotBlank(base64Str)){
                     NoCarWayBillFileInfo noCarWayBillFileInfo = new NoCarWayBillFileInfo();
                     noCarWayBillFileInfo.setBase64Str(base64Str);
                     noCarWayBillFileInfo.setFileName(waybillFileName);
@@ -627,7 +627,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             }
             RespR respR = noCarService.noCarHisWaybillStart(noCarWayBill);
             try {
-                if(respR.getCode() == 0){
+                if(respR.getCode() == 0 && StringUtils.isNotBlank(waybillFileName) && StringUtils.isNotBlank(base64Str) ){
                     //上传成功后文件入库
                     NoCarWayBillFileInfo noCarWayBillFileInfo = new NoCarWayBillFileInfo();
                     noCarWayBillFileInfo.setBase64Str(base64Str);