From e8ef2f93068e91354d3553ade2823ece0bdb32fc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 20 May 2020 19:20:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=8E=86=E5=8F=B2=E3=80=81=E5=BE=85=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8F=90=E4=BA=A4=E7=BD=91=E6=A0=BC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PartymemberBaseInfoServiceImpl.java            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
index efc8925a8b..7f3d8f829b 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
@@ -286,6 +286,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(),
 					gridInfoResult.getData().getCommnuityName(),
 					gridInfoResult.getData().getGridName());
+			gridFullPath = gridFullPath.replaceAll("null", "").trim();
 			gridFullPath = gridFullPath.replaceAll("--", "").trim();
 		}
 		//查询居民认证信息，获取居民头像
@@ -328,6 +329,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
 					gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(),
 					gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName());
+			gridFullPath = gridFullPath.replaceAll("null", "").trim();
 			gridFullPath = gridFullPath.replaceAll("--", "").trim();
 		}
 		//查询居民认证信息，获取居民头像