From 9be30faa135f733e7a058e492a71b510cef05218 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 28 May 2024 17:50:45 +0800
Subject: [PATCH] update

---
 app/adminapi/controller/works/bgsp/OaApproveController.php  | 4 ++--
 app/adminapi/controller/works/finance/ExpenseController.php | 2 +-
 app/adminapi/controller/works/finance/InvoiceController.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/controller/works/bgsp/OaApproveController.php b/app/adminapi/controller/works/bgsp/OaApproveController.php
index 30a644e39..16c09dae2 100644
--- a/app/adminapi/controller/works/bgsp/OaApproveController.php
+++ b/app/adminapi/controller/works/bgsp/OaApproveController.php
@@ -220,7 +220,7 @@
 			$param['check_step_sort'] = 0;
 			//删除原来的审核流程和审核记录
 			Db::name('oa_flow_step')->where(['action_id'=>$param['id']])->where('type',1)->update(['delete_time'=>time()]);
-			Db::name('oa_flow_record')->where(['action_id'=>$param['id']])->where('type',1)->update(['delete_time'=>time()]);
+			Db::name('oa_flow_record')->where(['action_id'=>$param['id']])->where('type',1)->update(['delete_time'=>time(),'is_invalid'=>1]);
 			if (empty($param['check_admin_ids'])) {
 				$flow_list = unserialize($flow['flow_list']);
 				if($flow_list[0]['flow_type'] == 1){
@@ -262,7 +262,7 @@
 			$checkData=array(
 				'action_id' => $param['id'],
 				'check_user_id' => $this->adminId,
-				'content' => '提交申请',
+				'content' => '重新提交申请',
 				'check_time' => time(),
 				'create_time' => time(),
 				'type' => 1,
diff --git a/app/adminapi/controller/works/finance/ExpenseController.php b/app/adminapi/controller/works/finance/ExpenseController.php
index ccebaa3cc..7bb6b73dd 100644
--- a/app/adminapi/controller/works/finance/ExpenseController.php
+++ b/app/adminapi/controller/works/finance/ExpenseController.php
@@ -109,7 +109,7 @@
 			}
 			//删除原来的审核流程和审核记录
 			Db::name('oa_flow_step')->where(['action_id'=>$params['id'],'type'=>2])->update(['delete_time'=>time()]);
-			Db::name('oa_flow_record')->where(['action_id'=>$params['id'],'type'=>2])->update(['delete_time'=>time()]);
+			Db::name('oa_flow_record')->where(['action_id'=>$params['id'],'type'=>2])->update(['delete_time'=>time(),'is_invalid'=>1]);
 			if (empty($params['check_admin_ids'])) {
 				$flow_list = unserialize($flow['flow_list']);
 				if($flow_list[0]['flow_type'] == 1){
diff --git a/app/adminapi/controller/works/finance/InvoiceController.php b/app/adminapi/controller/works/finance/InvoiceController.php
index 10445511c..5010fdaf2 100644
--- a/app/adminapi/controller/works/finance/InvoiceController.php
+++ b/app/adminapi/controller/works/finance/InvoiceController.php
@@ -105,7 +105,7 @@
 			}
 			//删除原来的审核流程和审核记录
 			Db::name('oa_flow_step')->where(['action_id'=>$params['id'],'type'=>3])->update(['delete_time'=>time()]);
-			Db::name('oa_flow_record')->where(['action_id'=>$params['id'],'type'=>3])->update(['delete_time'=>time()]);
+			Db::name('oa_flow_record')->where(['action_id'=>$params['id'],'type'=>3])->update(['delete_time'=>time(),'is_invalid'=>1]);
 			if (empty($params['check_admin_ids'])) {
 				$flow_list = unserialize($flow['flow_list']);
 				if($flow_list[0]['flow_type'] == 1){