Merge remote-tracking branch 'origin/dev'

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -180,6 +180,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         }*/
         userIdList.forEach(id -> {
             UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
+            if(null!=baseInfo){
                 //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
                 //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
                 if (StringUtils.isNotBlank(baseInfo.getStreet()) && StringUtils.isNotBlank(baseInfo.getSurname())) {
@@ -199,6 +200,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 }
                 userBaseInfoList.add(baseInfo);
                 //}
+            }else{
+                logger.error(String.format("userId【%s】,构造UserBaseInfoResultDTO为空",id));
+            }
+
         });
         return userBaseInfoList;
     }