From be88e66eaaa99c7164f202fbd82a5df561a1d0e5 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 30 May 2022 14:45:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IcPartyMemberController.java   |  1 +
 .../service/impl/IcResiUserServiceImpl.java   | 40 ++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
index 4864cd6e13..bfd266384f 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java
@@ -75,6 +75,7 @@ public class IcPartyMemberController implements ResultDataResolver {
     private IcPartyMemberService icPartyMemberService;
 
     @RequestMapping("page")
+    @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     public Result<PageData<IcPartyMemberResultDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFromDTO formDTO){
         PageData<IcPartyMemberResultDTO> page = icPartyMemberService.page(tokenDto, formDTO);
         return new Result<PageData<IcPartyMemberResultDTO>>().ok(page);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 644e649eb0..25bb255373 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -279,10 +279,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     //查询房屋信息
                     HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), map.get("HOME_ID"));
                     if (null != gridInfo && null != houseInfo) {
-                        String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
-                                .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
-                                .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
-                        partyMemberDTO.setAddress(address);
+                        String address;
+                        if (StringUtils.isNotBlank(gridInfo.getAllParentName())) {
+                            address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
+                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                        } else {
+                            address = gridInfo.getGridNamePath()
+                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                        }
                     }
                 }
                 //2022.05.18 end zhaoqf
@@ -499,9 +505,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     }
                     HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), houseId);
                     if (null != gridInfo && null != houseInfo) {
-                        String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
-                                .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
-                                .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                        String address;
+                        if (StringUtils.isNotBlank(gridInfo.getAllParentName())) {
+                            address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
+                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                        } else {
+                            address = gridInfo.getGridNamePath()
+                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                        }
                         partyMemberDTO.setAddress(address);
                     }
                 }
@@ -2191,9 +2204,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             //查询房屋信息
             HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), entity.getHomeId());
             if (null != gridInfo && null != houseInfo) {
-                String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
-                        .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
-                        .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                String address;
+                if (StringUtils.isNotBlank(gridInfo.getAllParentName())) {
+                    address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                } else {
+                    address = gridInfo.getGridNamePath()
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                }
                 result.setAddress(address);
             }
         }