From 98083d9077dd1647b7dc91e83106d77cca445a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=90=8C?= <494089941@qq.com>
Date: Wed, 8 Mar 2023 10:15:46 +0800
Subject: [PATCH] bug fix

---
 application/admin/controller/ExamineFlow.php | 2 +-
 application/admin/model/ExamineStep.php      | 2 ++
 application/crm/controller/Customer.php      | 1 +
 application/crm/model/CustomerCheck.php      | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/admin/controller/ExamineFlow.php b/application/admin/controller/ExamineFlow.php
index dbd8ec9..fd31925 100644
--- a/application/admin/controller/ExamineFlow.php
+++ b/application/admin/controller/ExamineFlow.php
@@ -295,7 +295,7 @@ class ExamineFlow extends ApiCommon
         $flow_id = $param['flow_id'];
         $types = $param['types'];
         $types_id = $param['types_id'];
-        $typesArr = ['crm_contract', 'crm_receivables', 'crm_invoice', 'oa_examine', 'jxc_purchase', 'jxc_retreat', 'jxc_sale', 'jxc_salereturn', 'jxc_payment', 'jxc_collection', 'jxc_allocation', 'jxc_inventory'];
+        $typesArr = ['crm_customer_check','crm_business','crm_contract', 'crm_receivables', 'crm_invoice', 'oa_examine', 'jxc_purchase', 'jxc_retreat', 'jxc_sale', 'jxc_salereturn', 'jxc_payment', 'jxc_collection', 'jxc_allocation', 'jxc_inventory'];
         if (!$types || !in_array($types, $typesArr)) {
             return resultArray(['error' => '参数错误']);
         }
diff --git a/application/admin/model/ExamineStep.php b/application/admin/model/ExamineStep.php
index 5f21099..1bc99bd 100644
--- a/application/admin/model/ExamineStep.php
+++ b/application/admin/model/ExamineStep.php
@@ -188,6 +188,8 @@ class ExamineStep extends Common
             case 'jxc_collection': $dataInfo = db('jxc_collection')->where(['collection_note_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
             case 'jxc_inventory': $dataInfo = db('jxc_inventory')->where(['inventory_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
             case 'jxc_allocation': $dataInfo = db('jxc_allocation')->where(['allocation_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
+            case 'crm_customer_check': $dataInfo = db('crm_customer_check')->where(['customer_check_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
+            case 'crm_business': $dataInfo = db('crm_business')->where(['business_id' => intval($types_id)])->field('create_user_id,owner_user_id,check_user_id,flow_id,order_id,check_status,update_time')->find(); break;
         }
         $stepInfo = [];
         if ($dataInfo['flow_id'] && !in_array($dataInfo['check_status'],['5'])) {
diff --git a/application/crm/controller/Customer.php b/application/crm/controller/Customer.php
index e2e32a8..bfe71d3 100644
--- a/application/crm/controller/Customer.php
+++ b/application/crm/controller/Customer.php
@@ -127,6 +127,7 @@ class Customer extends ApiCommon
         $customerCheck = db('crm_customer_check')->where(['customer_id' => $param['id']])->where(['check_status' => 0])->find();
         if (!empty($customerCheck)) {
             $data['flow_id'] = $customerCheck['flow_id'];
+            $data['owner_user_id']=$customerCheck['user_id'];
         }
         return resultArray(['data' => $data]);
     }
diff --git a/application/crm/model/CustomerCheck.php b/application/crm/model/CustomerCheck.php
index 90cbf45..268f16f 100644
--- a/application/crm/model/CustomerCheck.php
+++ b/application/crm/model/CustomerCheck.php
@@ -164,6 +164,8 @@ class CustomerCheck extends Common
             $createData[$key]['check_user_id'] = $param['check_user_id'] ?? 0;
             $createData[$key]['flow_user_id'] = $param['flow_user_id'] ?? 0;
             $createData[$key]['user_id'] = $param['user_id'] ?? 0;
+            $createData[$key]['create_user_id'] = $param['user_id'] ?? 0;
+            $createData[$key]['owner_user_id'] = $param['user_id'] ?? 0;
         }
 
         $this->startTrans();
-- 
2.36.3