From 4bcc6c53f7cfd10d4ce4fc57b8714fbcca721b4b Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Mon, 8 Dec 2025 13:42:20 +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 | 10 +++++-----
 app/crm/service/StockOrdersService.php        |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/common/service/ApprovalRecordsService.php b/app/common/service/ApprovalRecordsService.php
index 4d837af..9853b9d 100644
--- a/app/common/service/ApprovalRecordsService.php
+++ b/app/common/service/ApprovalRecordsService.php
@@ -56,13 +56,13 @@ class ApprovalRecordsService
             case 'todo':
 
                 if ($p['scene'] === 'todo') {
-                    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){
+//                    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';
                     $config['where']['instance.status'] = 'processing';
                 }
diff --git a/app/crm/service/StockOrdersService.php b/app/crm/service/StockOrdersService.php
index 1999cd7..cfd964a 100644
--- a/app/crm/service/StockOrdersService.php
+++ b/app/crm/service/StockOrdersService.php
@@ -35,11 +35,10 @@ class StockOrdersService extends \app\common\service\StockOrdersService
 
                 $config['order']['id'] = 'desc';
 
-//                $roles_id = array_intersect([1,5,6], $request->user->role_ids);
-//                if(count($roles_id) == 0){
-//                    $config['where']['salesperson_id'] = $request->user->uid;
-//                }
-                $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':