From a37ac90b7113cd50bdbcdb3aaff7d71dcd0cd642 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 6 Aug 2020 16:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4=EF=BC=9A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/UserBaseInfoServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index ccf719e385..84e196906f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -248,7 +248,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         result.setName(userInfo.getRealName());
         result.setGender(StringUtils.equals(NumConstant.ZERO_STR,userInfo.getGender()) || StringUtils.isBlank(userInfo.getGender()) ?
         ModuleConstant.GENDER_UNKNOWN : (StringUtils.equals(NumConstant.ONE_STR,userInfo.getGender()) ? ModuleConstant.GENDER_MALE : ModuleConstant.GENDER_FEMALE));
-        result.setAddress(new StringBuilder(userInfo.getDistrict()).append(userInfo.getStreet()).append(userInfo.getBuildingAddress()).toString());
+        result.setAddress(new StringBuilder(StringUtils.isBlank(userInfo.getDistrict()) ? ModuleConstant.EMPTY_STR : userInfo.getDistrict()).append(StringUtils.isBlank(userInfo.getStreet())? ModuleConstant.EMPTY_STR : userInfo.getStreet()).append(StringUtils.isBlank(userInfo.getBuildingAddress()) ? ModuleConstant.EMPTY_STR : userInfo.getBuildingAddress()).toString());
         result.setAssociatedGrid(userInfo.getRegisteredGridName());
         return result;
         }