From 7d087cb0a1e4d8d8d1469759da223d1705788fee Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Wed, 29 Apr 2020 17:22:37 +0800
Subject: [PATCH] =?UTF-8?q?gridFullPath=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerGridDao.xml     | 11 ++++++-----
 .../service/impl/PartymemberInfoServiceImpl.java      |  3 ++-
 .../mapper/partymember/PartymemberInfoDao.xml         |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

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 62a6993740..8b2962f518 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
@@ -96,13 +96,14 @@
     <!-- 根据gridId查询gridName -->
     <select id="selectGridNameByGridId" parameterType="com.epmet.dto.form.SelectGridNameByGridIdFormDTO" resultType="com.epmet.dto.result.SelectGridNameByGridIdResultDTO">
         SELECT
-            id AS gridId,
-            grid_name AS gridName
+            IFNULL(CONCAT(ca.all_parent_name,'-',ca.organization_name),'') AS gridName
         FROM
-            customer_grid
+            customer_grid cg
+            LEFT JOIN customer_agency ca ON ca.id = cg.pid
         WHERE
-            id = #{gridId}
-            AND del_flag = 0
+            cg.id = #{gridId}
+            AND cg.del_flag = 0
+            AND ca.del_flag = 0
     </select>
 
     <select id="getMyGrids" resultType="com.epmet.dto.result.CustomerGridByUserIdResultDTO">
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
index 56dc878bc9..a6b52cfd48 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
@@ -142,7 +142,8 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 	 */
 	@Override
 	public List<CertifiedResultDTO> certified(CertifiedFormDTO certifiedFormDTO) {
-		certifiedFormDTO.setPageNo(certifiedFormDTO.getPageNo() - NumConstant.ONE);
+		int pageIndex = (certifiedFormDTO.getPageNo() - NumConstant.ONE) * certifiedFormDTO.getPageSize();
+		certifiedFormDTO.setPageNo(pageIndex);
 		List<CertifiedResultDTO> certifiedResultDTOS = partyMemberInfoDao.selectCertifiedList(certifiedFormDTO);
 		if (certifiedResultDTOS.size()==0){
 			return new ArrayList<>();
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
index 3f716c5210..cbf85896be 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
@@ -94,7 +94,7 @@
             organization_type AS extraOrganization,
             extra_certifier_name AS contactPeople,
             extra_certifier_mobile AS contactMobile,
-            CONCAT(street,estate,building) AS address
+            IFNULL(CONCAT(IFNULL(street,null),IFNULL(estate,null),IFNULL(building,null)),'') AS address
         FROM
             partymember_info pi
         WHERE