gridFullPath修改

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,
+            IFNULL(CONCAT(ca.all_parent_name,'-',ca.organization_name),'') AS gridName
-            grid_name AS gridName
         FROM
-            customer_grid
+            customer_grid cg
+            LEFT JOIN customer_agency ca ON ca.id = cg.pid
         WHERE
-            id = #{gridId}
+            cg.id = #{gridId}
-            AND del_flag = 0
+            AND cg.del_flag = 0
+            AND ca.del_flag = 0
     </select>
 
     <select id="getMyGrids" resultType="com.epmet.dto.result.CustomerGridByUserIdResultDTO">

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

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