From a0a71161d35633d05282a7d6e187a43194510496 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Mon, 8 Dec 2025 13:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=8D=95=E4=B8=8E=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/service/ApprovalRecordsService.php | 6 +++++-
 app/crm/service/StockOrdersService.php        | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/common/service/ApprovalRecordsService.php b/app/common/service/ApprovalRecordsService.php
index 61c026e..2de3f44 100644
--- a/app/common/service/ApprovalRecordsService.php
+++ b/app/common/service/ApprovalRecordsService.php
@@ -56,7 +56,11 @@ class ApprovalRecordsService
             case 'todo':
 
                 if ($p['scene'] === 'todo') {
-                    if (!in_array(1, $request->user->role_ids)) {
+//                    if (!in_array(1, $request->user->role_ids)) {
+//                        $config['where']['approver_id'] = $request->user->uid;
+//                    }
+                    $roles_id = array_intersect([1,5,6], $request->user->role_ids);
+                    if(count($roles_id) === 0){
                         $config['where']['approver_id'] = $request->user->uid;
                     }
                     $config['where']['status'] = 'pending';
diff --git a/app/crm/service/StockOrdersService.php b/app/crm/service/StockOrdersService.php
index 492ffd3..d9408d7 100644
--- a/app/crm/service/StockOrdersService.php
+++ b/app/crm/service/StockOrdersService.php
@@ -2,6 +2,7 @@
 
 namespace app\crm\service;
 
+use app\common\model\User;
 use support\Request;
 use support\exception\BusinessException;
 
@@ -34,7 +35,10 @@ class StockOrdersService extends \app\common\service\StockOrdersService
 
                 $config['order']['id'] = 'desc';
 
-                $config['where']['salesperson_id'] = $request->user->uid;
+                $roles_id = array_intersect([1,5,6], $request->user->role_ids);
+                if(count($roles_id) === 0){
+                    $config['where']['salesperson_id'] = $request->user->uid;
+                }
                 break;
             case 'print':
             case 'approval':