From 4c393e1ac101e2a962bb4cbc95a0b9bed842c812 Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Fri, 8 Nov 2024 15:59:41 +0800
Subject: [PATCH] Merge branch 'master' of http://gitea.dctpay.com/hurui/youtao

---
 .../main/java/com/hfkj/controller/order/BsOrderController.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cweb/src/main/java/com/hfkj/controller/order/BsOrderController.java b/cweb/src/main/java/com/hfkj/controller/order/BsOrderController.java
index 63dfea1..d96990f 100644
--- a/cweb/src/main/java/com/hfkj/controller/order/BsOrderController.java
+++ b/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<>();