From f0ab9af7b1b8f8c716fe1e9a9e5cf045a429cece Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Sun, 25 Apr 2021 16:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7bug-=E4=BF=AE=E6=94=B9NPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/UserResiInfoServiceImpl.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 4221d063f9..5aeb7fe9bb 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
@@ -253,9 +253,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		//微信昵称:nickname 头像:headImgUrl 性别:gender
 		List<UserWechatEntity> wechat = userWechatService.selectByUserId(userResiInfoDTO.getUserId());
 		if(null != wechat && !wechat.isEmpty()){
-			baseInfo.setHeadImgUrl(wechat.get(NumConstant.ZERO).getHeadImgUrl());
-			baseInfo.setGender(wechat.get(NumConstant.ZERO).getSex().toString());
-			baseInfo.setNickname(wechat.get(NumConstant.ZERO).getNickname());
+			UserWechatEntity wechatEntity = wechat.get(NumConstant.ZERO);
+			baseInfo.setHeadImgUrl(wechatEntity.getHeadImgUrl());
+			if (wechatEntity.getSex() == null){
+				//设置未知
+				baseInfo.setGender(NumConstant.ZERO_STR);
+			}else{
+				baseInfo.setGender(String.valueOf(wechatEntity.getSex()));
+			}
+			baseInfo.setNickname(wechatEntity.getNickname());
 		}
 		userBaseInfoService.insertOrUpdate(baseInfo);
 	}