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

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

@@ -239,14 +239,13 @@ public class BaseOrderController extends CommonBaseController implements UserRes
                     List<Integer> tourUserIds = Arrays.asList(orderPageVO.getOrderTourDetail().getTourUserIds().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
                     ObjectRestResponse<List<AppUserVo>> users = userFeign.getByUserIds(tourUserIds);
                     if (users.getData() != null) {
-                        orderPageVO.getOrderTourDetail().setUserVoList(users.getData() == null? users.getData() : null);
+                        orderPageVO.getOrderTourDetail().setUserVoList(users.getData() == null? users.getData() : new ArrayList<>());
                     }
                 }
 
 
             }
         }
-
         return new ObjectRestResponse<>().data(pageDataVO);
     }