diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index 944c8afb2f..a05eac28c6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -73,4 +73,6 @@ public interface StrConstant { * 空字符串 */ String EPMETY_STR=""; + + String NULL_STR="null"; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index 9523693d46..3694611f3c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java @@ -342,7 +342,9 @@ public class WorkActUserServiceImpl implements WorkActUserService { if (StringUtils.isNotBlank(userBaseInfo.getIdNum())) { resultDTO.setIdNum(userBaseInfo.getIdNum()); } - resultDTO.setAddress(userBaseInfo.getStreet()+userBaseInfo.getDistrict()+userBaseInfo.getBuildingAddress()); + String address = userBaseInfo.getStreet() + userBaseInfo.getDistrict() + userBaseInfo.getBuildingAddress(); + address = address.replaceAll(StrConstant.NULL_STR, StrConstant.EPMETY_STR); + resultDTO.setAddress(address); } resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime()); /**