From 6aea040358e620fdb46e58036874292c21074579 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 5 Aug 2020 16:39:45 +0800
Subject: [PATCH] =?UTF-8?q?userdetail=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/constant/StrConstant.java    | 2 ++
 .../java/com/epmet/service/impl/WorkActUserServiceImpl.java   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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());
         /**