Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong into main

.gitignore

@@ -6,4 +6,5 @@
 /public/uploads
 /public/static
 sftp-config.json
-*.DS_Store
+*.DS_Store
+.env

app/store/model/Order.php

@@ -106,9 +106,9 @@ class Order extends OrderModel
         // 检索查询条件
         $filter = $this->getQueryFilter($param);
         //不是店长查询当前用户订单
-        if(!UserService::isStore()) {
-            $filter[] = ['user.user_id' ,'=', UserService::getCurrentLoginUserId() ];
-        }
+        // if(!UserService::isStore()) {
+        //     $filter[] = ['user.user_id' ,'=', UserService::getCurrentLoginUserId() ];
+        // }
         $filterOr = [];
         if (!empty($param['searchValue']) && $param['searchType'] == 'all') {
 //            $filterOr = [

app/store/model/OrderRefund.php

@@ -38,10 +38,10 @@ class OrderRefund extends OrderRefundModel
         // 检索查询条件
         $filter = $this->getFilter($param);
         //不是店长查询当前用户订单
-        if(!UserService::isStore()) {
-            $filter[] = ['user.user_id' ,'=', UserService::getCurrentLoginUserId() ];
-        }
-        $filterOr = [];
+        // if(!UserService::isStore()) {
+        //     $filter[] = ['user.user_id' ,'=', UserService::getCurrentLoginUserId() ];
+        // }
+        $filterOr = [];Ne
         if (!empty($param['searchValue']) && $param['searchType'] == 'all') {
 //            $filterOr = [
 //                ['order.order_no', 'like', "%{$param['searchValue']}%"],