From 863f625f2758b3f0309c6afda85d29d534257019 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Thu, 1 Apr 2021 13:51:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=94=A8=E6=88=B7=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=20=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserBaseInfoServiceImpl.java |  5 ++++-
 .../service/impl/UserResiInfoServiceImpl.java | 21 ++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

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 e779487861..f3a77c85fe 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
@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -150,7 +151,9 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             logger.warn("queryUserBaseInfo return empty,userId:{}", userId);
             return null;
         }
-        return userBaseInfoResultDTOS.get(0);
+        UserBaseInfoResultDTO userBaseInfoResultDTO = userBaseInfoResultDTOS.get(0);
+        logger.debug("getUserResiInfoDTO userId:{},result:{}", userId,JSON.toJSONString(userBaseInfoResultDTO));
+        return userBaseInfoResultDTO;
     }
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index a217a5dae1..31285ed293 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -173,17 +173,18 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			resultDTO.setDistrict(userBaseInfoResultDTO.getDistrict());
 			resultDTO.setBuildingAddress(userBaseInfoResultDTO.getBuildingAddress());
 			resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
-
-			String gender = null;
-			if (NumConstant.ONE_STR.equals(userBaseInfoResultDTO.getGender())) {
-				gender = UserConstant.MAN;
-			} else if (NumConstant.TWO_STR.equals(userBaseInfoResultDTO.getGender())) {
-				gender = UserConstant.WOMAN;
-			} else {
-				gender = UserConstant.MAN_WOMAN;
+			if (StringUtils.isNotBlank(userBaseInfoResultDTO.getStreet()) && StringUtils.isNotBlank(userBaseInfoResultDTO.getSurname())){
+				String gender = null;
+				if (NumConstant.ONE_STR.equals(userBaseInfoResultDTO.getGender())) {
+					gender = UserConstant.MAN;
+				} else if (NumConstant.TWO_STR.equals(userBaseInfoResultDTO.getGender())) {
+					gender = UserConstant.WOMAN;
+				} else {
+					gender = UserConstant.MAN_WOMAN;
+				}
+				String leaderName = userBaseInfoResultDTO.getStreet().concat(StrConstant.HYPHEN).concat(userBaseInfoResultDTO.getSurname()).concat(gender);
+				resultDTO.setShowName(leaderName);
 			}
-			String leaderName = userBaseInfoResultDTO.getStreet().concat(StrConstant.HYPHEN).concat(userBaseInfoResultDTO.getSurname()).concat(gender);
-			resultDTO.setShowName(leaderName);
 			resultDTO.setHeadPhoto(userBaseInfoResultDTO.getHeadImgUrl());
 			return new Result<UserResiInfoResultDTO>().ok(resultDTO);
 		}