Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix

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());
 

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}
                 ]]>