From 712daed9bdbd5109cbad7869ed0d2c321eed7981 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 18 Sep 2021 16:27:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BC=93=E5=AD=98userfabu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserBaseInfoServiceImpl.java | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 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 1ce80e7e61..acb101464e 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
@@ -180,25 +180,30 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         }*/
         userIdList.forEach(id -> {
             UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
-            //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
-            //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
-            if (StringUtils.isNotBlank(baseInfo.getStreet()) && StringUtils.isNotBlank(baseInfo.getSurname())) {
-                if ("1".equals(baseInfo.getGender())) {
-                    //    男
-                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("先生")));
-                } else if ("2".equals(baseInfo.getGender())) {
-                    //   女
-                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士")));
+            if(null!=baseInfo){
+                //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
+                //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
+                if (StringUtils.isNotBlank(baseInfo.getStreet()) && StringUtils.isNotBlank(baseInfo.getSurname())) {
+                    if ("1".equals(baseInfo.getGender())) {
+                        //    男
+                        baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("先生")));
+                    } else if ("2".equals(baseInfo.getGender())) {
+                        //   女
+                        baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士")));
+                    } else {
+                        // 0 未知
+                        baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士/先生")));
+                    }
                 } else {
-                    // 0 未知
-                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士/先生")));
+                    //    社会为微信昵称
+                    baseInfo.setUserShowName(baseInfo.getNickname());
                 }
-            } else {
-                //    社会为微信昵称
-                baseInfo.setUserShowName(baseInfo.getNickname());
+                userBaseInfoList.add(baseInfo);
+                //}
+            }else{
+                logger.error(String.format("userId【%s】,构造UserBaseInfoResultDTO为空",id));
             }
-            userBaseInfoList.add(baseInfo);
-            //}
+
         });
         return userBaseInfoList;
     }