Merge branch 'master' of http://gitea.dctpay.com/hurui/youtao

cweb/src/main/java/com/hfkj/controller/order/BsOrderController.java

@@ -120,9 +120,11 @@ public class BsOrderController {
 
 
         List<BsOrder> list = orderService.getOrderList(new HashMap<>());
+        list = list.stream().filter(s->s.getUserId() != null).collect(Collectors.toList());
 
         // 查询个人订单
         List<BsOrder> orderUserList = list.stream().filter(s-> s.getUserId() != null).filter(s->s.getUserId().equals(session.getUser().getId())).collect(Collectors.toList());
+
         //查询团队
         // 查询团队用户
         Map<String,Object> param = new HashMap<>();