带奇峰修改:党员自动认证失败 详情中值错误问题

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -477,9 +477,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfo.getGridId());
 		String gridFullPath = "";
 		if (gridInfoResult.success() && null != gridInfoResult.getData()) {
-			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(),
+			gridFullPath = String.format("%s-%s-%s", null == gridInfoResult.getData().getStreetName() ? "" : gridInfoResult.getData().getStreetName(),
-					gridInfoResult.getData().getCommnuityName(),
+					null == gridInfoResult.getData().getCommnuityName() ? "" : gridInfoResult.getData().getCommnuityName(),
-					gridInfoResult.getData().getGridName());
+					null == gridInfoResult.getData().getGridName() ? "" : gridInfoResult.getData().getGridName());
 			gridFullPath = gridFullPath.replaceAll("--", "").trim();
 		}
 		resultDTO.setGridFullPath(gridFullPath);