diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java
index 78b2286..076c463 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java
@@ -169,6 +169,10 @@ public class CommonController extends BaseController
     {
         try {
             AddressParseResult addressParseResult = emisRegionService.parseAddress(content);
+            if(addressParseResult==null){
+                return AjaxResult.error("地址解析失败");
+            }
+
             return AjaxResult.success("解析成功",addressParseResult);
         }catch (Exception ex){
             ex.printStackTrace();
diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
index 683699b..3305a1e 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
@@ -276,7 +276,7 @@ public class WaybillController extends BaseController
         try {
 
             if(StringUtils.isEmpty(waybillOrder.getBillCode()) ){
-                waybillOrder.setBillCode(emisElectronicSitePagService.realMatchWaybill(waybillOrder.getSendSiteCode(),"T7080"));
+                    waybillOrder.setBillCode(emisElectronicSitePagService.realMatchWaybill(waybillOrder.getSendSiteCode(), "T7080"));
             }
 
             EmisWaybill emisWaybillSave = waybillOrder.toDb();
@@ -342,7 +342,6 @@ public class WaybillController extends BaseController
         try {
             EmisWaybill emisWaybillSave = waybillOrder.toDb();
 
-
             if(emisWaybillSave.getTotalVolume()==null){
                 emisWaybillSave.setTotalVolume(BigDecimal.ZERO);
             }