From 5b42fcb04d7aa31b20e2227a0513ec80ff508fe5 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 2 Jul 2020 17:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java  | 4 ++--
 .../src/main/resources/mapper/CustomerGridDao.xml             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 e88c1ebaa5..505114f8b0 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
@@ -154,8 +154,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             //cx代表市
             //yz代表区
             map.put("areaCode",areaCode);
-            map.put("cityCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR));
-            map.put("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.TWO));
+            map.put("cityCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.TWO));
+            map.put("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR));
             map.put("pageSize",listCustomerGridFormDTO.getPageSize());
             map.put("pageNo",listCustomerGridFormDTO.getPageNo());
 
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 5944b91291..52d8e15bc2 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
@@ -134,7 +134,7 @@
         WHERE
         b.del_flag = 0
         AND
-        (b.area_code LIKE CONCAT(#{cityCode},'%') OR b.area_code = #{provinceCode})
+        b.area_code LIKE CONCAT(#{cityCode},'%')
 
         AND  <![CDATA[ b.area_code <> #{areaCode}
                 ]]>