Merge remote-tracking branch 'remotes/origin/dev_bugfix'

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);
 	}