待审核列表、已审核列表提交网格bug修改

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

@@ -469,9 +469,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(),
-					gridInfoResult.getData().getCommnuityName(),
-					gridInfoResult.getData().getGridName());
+			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("--", "").trim();
 		}
 		resultDTO.setGridFullPath(gridFullPath);

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

@@ -325,9 +325,9 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(formDTO.getGridId());
 		String gridFullPath = "";
 		if (gridInfoResult.success() && null != gridInfoResult.getData()) {
-			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(),
-					gridInfoResult.getData().getCommnuityName(),
-					gridInfoResult.getData().getGridName());
+			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("--", "").trim();
 		}
 		//查询居民认证信息，获取居民头像