diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 4cfc23d59..23cd633fb 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -3600,12 +3600,12 @@ public class EmisBaseService {
                      throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业税号必须为8-18位数字和大写字母组成，不能包含汉字、空格等特殊符号");
                  }
              } else {
-                 emisCustomerAddressNew.setEnterpriseName(null);
-                 emisCustomerAddressNew.setEnterpriseTaxId(null);
+                 emisCustomerAddressNew.setEnterpriseName(" ");
+                 emisCustomerAddressNew.setEnterpriseTaxId(" ");
              }
          } else {
-             emisCustomerAddressNew.setEnterpriseName(null);
-             emisCustomerAddressNew.setEnterpriseTaxId(null);
+             emisCustomerAddressNew.setEnterpriseName(" ");
+             emisCustomerAddressNew.setEnterpriseTaxId(" ");
          }
      }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 958603850..38d94c6e8 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -2496,6 +2496,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         if(isNew) {
             emisWaybillSave.setOrderDate(emisWaybillSave.getSendDate());
         }
+        if (!"0086".equals(emisWaybillSave.getSendCounty())) {
+            emisWaybillSave.setEnterpriseName(" ");
+            emisWaybillSave.setEnterpriseTaxId(" ");
+        }
 
         // 发件地址
         EmisCustomerAddress sendAddress = new EmisCustomerAddress();