From 0a7efe2a07308d85509a5f950f7542b8e47692ee Mon Sep 17 00:00:00 2001
From: ztt <835303992@qq.com>
Date: Tue, 27 Feb 2024 11:05:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=95=BF=E7=AB=AF=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=B8=8D=E8=AE=A1=E5=85=A5user=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/model/Order.php              | 7 ++++++-
 app/api/model/RecoveryOrder.php      | 9 ++++++---
 app/api/model/Server/ServerOrder.php | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/api/model/Order.php b/app/api/model/Order.php
index 57690e05..f680163e 100644
--- a/app/api/model/Order.php
+++ b/app/api/model/Order.php
@@ -225,7 +225,12 @@ class Order extends OrderModel
         // 当前用户ID
         $userId = UserService::getCurrentLoginUserId();
         // 查询数据
-        $query = $this->where('user_id', '=', $userId);
+        $query = $this;
+        // 非店长不带入user_id查询
+        if(!UserService::isStore()) {
+            $query = $this->where('user_id', '=', $userId);
+        }
+
         if ($dealer_order_ids) {
             $query->whereIn('order_id', $dealer_order_ids);
         }
diff --git a/app/api/model/RecoveryOrder.php b/app/api/model/RecoveryOrder.php
index 5746294f..9073d321 100644
--- a/app/api/model/RecoveryOrder.php
+++ b/app/api/model/RecoveryOrder.php
@@ -135,9 +135,12 @@ class RecoveryOrder extends BaseRecoveryOrder
         // 当前用户ID
         $userId = UserService::getCurrentLoginUserId();
         // 查询数据
-        return self::where('user_id', '=', $userId)
-            ->where('order_status', '=', $type)
-            ->count();
+        $query = self::where('order_status', '=', $type);
+        // 非店长不带入user_id查询
+        if (!UserService::isStore()) {
+            $query = self::where('user_id', '=', $userId);
+        }
+        return $query->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/api/model/Server/ServerOrder.php b/app/api/model/Server/ServerOrder.php
index 07e1b9ae..86558856 100644
--- a/app/api/model/Server/ServerOrder.php
+++ b/app/api/model/Server/ServerOrder.php
@@ -217,8 +217,12 @@ class ServerOrder extends Order
         // 当前用户ID
         $userId = UserService::getCurrentLoginUserId();
         // 查询数据
-        return $this->where('user_id', '=', $userId)
-            ->where($dataTypeFilter)
+        $query = $this;
+        // 非店长不带入user_id查询
+        if (!UserService::isStore()) {
+            $query->where('user_id', '=', $userId);
+        }
+        return $query->where($dataTypeFilter)
             ->where('is_delete', '=', 0)
             ->count();
     }