diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index b4ba5b253..946fa4d7d 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -363,10 +363,10 @@ public class EmisWaybillController extends EmisBaseController
             "sendCountry","sendCountryName",
             "sendProvince","sendProvinceName",
             "sendCity","sendCityName",
-            "transLineType","transLineName",
-            "productType","productName",
+            "transLineType","transLineTypeName",
+            "productType","productTypeName",
             "sendSiteName","destinationName",
-            "dispatchUnderlingSiteName"
+            "dispatchUnderlingSiteName",
 
 
     },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
index f4db2c8c7..124108569 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
@@ -224,10 +224,19 @@
             and `name` = #{name}
             and phone = #{phone}
             and province = #{province}
-            and city = #{city}
-            and county = #{county}
-            and address = #{address}
-            and company = #{company}
+
+        <if test="city != null and city != ''"> and city = #{city}</if>
+        <if test="city == null">and city is null</if>
+
+        <if test="county != null and county != ''">and county = #{county}</if>
+        <if test="county == null ">and county is null</if>
+
+        <if test="address != null and address != ''">and address = #{address}</if>
+        <if test="address == null">and address is null</if>
+
+        <if test="company != null and company != ''">and company = #{company}</if>
+        <if test="company == null">and company is null</if>
+
             and address_type = #{addressType}
             and customer_code is null
     </select>
@@ -239,11 +248,21 @@
            and `name` = #{name}
            and phone = #{phone}
            and province = #{province}
-           and city = #{city}
-           and county = #{county}
-           and address = #{address}
-           and company = #{company}
-           and address_type = #{addressType}
+
+        <if test="city != null and city != ''"> and city = #{city}</if>
+        <if test="city == null">and city is null</if>
+
+        <if test="county != null and county != ''">and county = #{county}</if>
+        <if test="county == null ">and county is null</if>
+
+        <if test="address != null and address != ''">and address = #{address}</if>
+        <if test="address == null">and address is null</if>
+
+        <if test="company != null and company != ''">and company = #{company}</if>
+        <if test="company == null">and company is null</if>
+
+
+        and address_type = #{addressType}
 		limit 1
 	</select>