Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -97,12 +97,19 @@ public class BackStageOrderController extends CommonBaseController implements Us
         if (userIds != null && userIds.size() > 0) {
             ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds);
             log.info("获取用户信息：objectRestResponse = {}", objectRestResponse.getData());
-            Map<Integer, AppUserVo> appUserVoMap = objectRestResponse.getData() == null ? new HashMap<Integer, AppUserVo>()
-                    : objectRestResponse.getData().parallelStream().collect(Collectors.toMap(v -> v.getUserid(), v ->v));
+            Map<Integer, AppUserVo> appvoMap = new HashMap<Integer, AppUserVo>();
+            if(objectRestResponse.getData() != null) {
+                for(AppUserVo appUserVo : objectRestResponse.getData()) {
+                    if(appUserVo != null) {
+                        appvoMap.put(appUserVo.getUserid(), appUserVo);
+                    }
+
+                }
+            }
 
             for (OrderListVo orderPageVO : list) {
-                AppUserVo appUserVo = appUserVoMap.get(orderPageVO.getUserId());
-                if (null != appUserVo) {
+                AppUserVo appUserVo = appvoMap.get(orderPageVO.getUserId());
+                if(appUserVo != null) {
                     orderPageVO.setTelephone(appUserVo.getUsername());
                     orderPageVO.setUsername(appUserVo.getNickname());
                 }