diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 107616d691..269502bec9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -620,7 +620,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         formDTO.setPageNo((formDTO.getPageNo() - 1) * formDTO.getPageSize());
 
         //地区编码如何是00结尾的则查询当前地区数据（实际业务不会存在，因为地区必须选到区县级）
-        if (areaCode.endsWith(ModuleConstant.LAST_TWO_LETTER_OF_FORMATIVE_CITY_CODE)) {
+        if (StringUtils.isNotBlank(areaCode) && areaCode.endsWith(ModuleConstant.LAST_TWO_LETTER_OF_FORMATIVE_CITY_CODE)) {
             //城市 - 查全部
             formDTO.setAreaCode(areaCode.substring(0, areaCode.length() - 2));
             List<PublicCustomerGridForStrangerResultDTO> gridList = baseDao.selectThirdGridByCityLike(formDTO);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index c6ad656854..912a52a779 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -428,10 +428,10 @@
         ) agency ON grid.PID = agency.ID
        WHERE
            grid.del_flag = 0
-       AND
-           grid.area_code LIKE CONCAT(#{areaCode},'%')
-       AND
-           grid.customer_id = #{customerId}
+            <if test='areaCode != "" and areaCode != null'>
+               AND grid.area_code LIKE CONCAT(#{areaCode},'%')
+            </if>
+            AND grid.customer_id = #{customerId}
        ORDER BY
            grid.customer_id,
            CONVERT ( gridName USING gbk ) ASC
@@ -468,7 +468,9 @@
                 ) agency ON a.PID = agency.ID
                 WHERE
                     a.del_flag = 0
-                AND a.area_code = #{areaCode}
+                <if test='areaCode != "" and areaCode != null'>
+                        AND a.area_code = #{areaCode}
+                </if>
                 AND a.customer_id = #{customerId}
                 ORDER BY
                   CONVERT ( gridName USING gbk ) ASC
@@ -501,7 +503,9 @@
                     b.del_flag = 0
                 AND b.customer_id = #{customerId}
                 AND b.area_code LIKE CONCAT(#{cityCode},'%')
-                AND  <![CDATA[ b.area_code <> #{areaCode}]]>
+                <if test='areaCode != "" and areaCode != null'>
+                    AND  <![CDATA[ b.area_code <> #{areaCode}]]>
+                </if>
                 ORDER BY
                     b.area_code DESC ,CONVERT ( gridName USING gbk ) ASC
                 LIMIT 0,999999999999