From 67eaba2687262a4adc002cdd84ff5105c9387fd8 Mon Sep 17 00:00:00 2001
From: mzl <mzl@hnxinyouhe.com>
Date: Mon, 15 Sep 2025 16:38:00 +0800
Subject: [PATCH] ts

---
 app/common/service/StockOrdersService.php                 | 2 +-
 app/common/traits/DataTransformer.php                     | 1 +
 app/common/utils/approval/service/ApprovalFlowService.php | 3 +++
 app/controller/IndexController.php                        | 2 +-
 app/crm/service/StockOrdersService.php                    | 4 ----
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/common/service/StockOrdersService.php b/app/common/service/StockOrdersService.php
index ea78b6f..e87d37b 100644
--- a/app/common/service/StockOrdersService.php
+++ b/app/common/service/StockOrdersService.php
@@ -66,7 +66,7 @@ class StockOrdersService
 
                 $config['order']['id'] = 'desc';
 
-                $config['where']['salesperson_id'] = $request->user->uid;
+                // $config['where']['salesperson_id'] = $request->user->uid;
                 break;
             case 'print':
             case 'approval':
diff --git a/app/common/traits/DataTransformer.php b/app/common/traits/DataTransformer.php
index 4f3abac..adde8e6 100644
--- a/app/common/traits/DataTransformer.php
+++ b/app/common/traits/DataTransformer.php
@@ -50,6 +50,7 @@ trait DataTransformer
             return [
                 'error'   => true,
                 'message' => $e->getMessage(),
+                // 'message' => $e->getMessage()."\n".$e->getLine()."\n".$e->getFile(),
                 'code'    => $e->getCode(),
             ];
         }
diff --git a/app/common/utils/approval/service/ApprovalFlowService.php b/app/common/utils/approval/service/ApprovalFlowService.php
index 2854e4e..57470a6 100644
--- a/app/common/utils/approval/service/ApprovalFlowService.php
+++ b/app/common/utils/approval/service/ApprovalFlowService.php
@@ -48,6 +48,9 @@ class ApprovalFlowService
                 'initiator_id' => $initiatorId,
                 'current_step' => $firstIndex,
                 'status'       => 'processing',
+                'flow_type'    => $flowType,
+                'biz_type'     => $bizType,
+                'biz_id'       => $bizId,
             ];
 
             // 解析首步审批人（支持 role_id 或 roles.name）
diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php
index 319aa49..b99ead4 100644
--- a/app/controller/IndexController.php
+++ b/app/controller/IndexController.php
@@ -155,7 +155,7 @@ class IndexController
             noticePush([
                 'title'     => $title,
                 'content'   => $content,
-                'recipient' => [1],
+                'recipient' => [1,74,78],
                 'email'     => 1
             ]);
         } catch (\Throwable $th) {
diff --git a/app/crm/service/StockOrdersService.php b/app/crm/service/StockOrdersService.php
index df4085a..48627a0 100644
--- a/app/crm/service/StockOrdersService.php
+++ b/app/crm/service/StockOrdersService.php
@@ -400,19 +400,15 @@ class StockOrdersService
     public function serviceUltimateApproval(Request $request)
     {
         $config = $this->buildQueryConfig($request, 'detail');
-
         $item = $this->logicShow($config);
         foreach ($item->items as $k => $v) {
             if ($v->vin === '') {
                 throw new BusinessException('存在未填写vin的车辆，无法完成提交审核');
             }
         }
-
-
         $this->logicUpdateBy($config, [
             'approval_status' => 1
         ]);
-        // $item = $this->logicShow($config);
         $this->startApproval($item);
         return $this->postProcess('UltimateApproval', $item);
     }