From 71013b56a6d949785dbf4d5d37c6df4dc5bc5960 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Wed, 29 May 2024 16:51:53 +0800
Subject: [PATCH] update

---
 .../controller/works/bgsp/OaApproveController.php    | 12 +++---------
 .../controller/works/finance/ExpenseController.php   | 12 +++---------
 .../controller/works/finance/InvoiceController.php   | 12 +++---------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/app/adminapi/controller/works/bgsp/OaApproveController.php b/app/adminapi/controller/works/bgsp/OaApproveController.php
index 225374267..a3afce507 100644
--- a/app/adminapi/controller/works/bgsp/OaApproveController.php
+++ b/app/adminapi/controller/works/bgsp/OaApproveController.php
@@ -286,12 +286,6 @@
 			if(empty($params['check']) || !in_array($params['check'],[1,2,3])){
 				return $this->fail('审核参数错误');
 			}
-			if(empty($params['content'])){
-				$mes = match ($params['check']){
-					1=>'请填写审核意见',2=>'请填写审核意见',3=>'请填写撤销理由'
-				};
-				return $this->fail($mes);
-			}
 			$data = Db::name('oa_approve')->where('id',$params['id'])->find();
 			if(empty($data)){
 				return $this->fail('数据信息不存在');
@@ -314,7 +308,7 @@
 						'type' => 1,
 						'check_time' => time(),
 						'status' => $params['check'],
-						'content' => $params['content'],
+						'content' => $params['content'] ?? '',
 						'create_time' => time()
 					);
 					Db::name('oa_flow_record')->strict(false)->field(true)->insertGetId($checkData);
@@ -361,7 +355,7 @@
 						'type' => 1,
 						'check_time' => time(),
 						'status' => $params['check'],
-						'content' => $params['content'],
+						'content' => $params['content'] ?? '',
 						'create_time' => time()
 					);
 					Db::name('oa_flow_record')->strict(false)->field(true)->insertGetId($checkData);
@@ -480,7 +474,7 @@
 						'type' => 1,
 						'check_time' => time(),
 						'status' => $params['check'],
-						'content' => $params['content'],
+						'content' => $params['content'] ?? '',
 						'create_time' => time()
 					);
 					Db::name('oa_flow_record')->strict(false)->field(true)->insertGetId($checkData);
diff --git a/app/adminapi/controller/works/finance/ExpenseController.php b/app/adminapi/controller/works/finance/ExpenseController.php
index 13a4b5807..907a98d31 100644
--- a/app/adminapi/controller/works/finance/ExpenseController.php
+++ b/app/adminapi/controller/works/finance/ExpenseController.php
@@ -474,12 +474,6 @@
 			if(empty($params['check']) || !in_array($params['check'],[1,2,3])){
 				return $this->fail('审核参数错误');
 			}
-			if(empty($params['content'])){
-				$mes = match ($params['check']){
-					1=>'请填写审核意见',2=>'请填写审核意见',3=>'请填写撤销理由'
-				};
-				return $this->fail($mes);
-			}
 			$data = Db::name('oa_expense')->where('id',$params['id'])->find();
 			if(empty($data)){
 				return $this->fail('数据信息不存在');
@@ -502,7 +496,7 @@
 						'type' => 2,
 						'check_time' => time(),
 						'status' => $params['check'],
-						'content' => $params['content'],
+						'content' => $params['content'] ?? '',
 						'create_time' => time()
 					);
 					Db::name('oa_flow_record')->strict(false)->field(true)->insertGetId($checkData);
@@ -549,7 +543,7 @@
 						'type' => 2,
 						'check_time' => time(),
 						'status' => $params['check'],
-						'content' => $params['content'],
+						'content' => $params['content'] ?? '',
 						'create_time' => time()
 					);
 					Db::name('oa_flow_record')->strict(false)->field(true)->insertGetId($checkData);
@@ -668,7 +662,7 @@
 						'type' => 2,
 						'check_time' => time(),
 						'status' => $params['check'],
-						'content' => $params['content'],
+						'content' => $params['content'] ?? '',
 						'create_time' => time()
 					);
 					Db::name('oa_flow_record')->strict(false)->field(true)->insertGetId($checkData);
diff --git a/app/adminapi/controller/works/finance/InvoiceController.php b/app/adminapi/controller/works/finance/InvoiceController.php
index 5824e60fa..c8712f400 100644
--- a/app/adminapi/controller/works/finance/InvoiceController.php
+++ b/app/adminapi/controller/works/finance/InvoiceController.php
@@ -461,12 +461,6 @@
 			if(empty($params['check']) || !in_array($params['check'],[1,2,3])){
 				return $this->fail('审核参数错误');
 			}
-			if(empty($params['content'])){
-				$mes = match ($params['check']){
-					1=>'请填写审核意见',2=>'请填写审核意见',3=>'请填写撤销理由'
-				};
-				return $this->fail($mes);
-			}
 			$data = Db::name('oa_invoice')->where('id',$params['id'])->find();
 			if(empty($data)){
 				return $this->fail('数据信息不存在');
@@ -489,7 +483,7 @@
 						'type' => 3,
 						'check_time' => time(),
 						'status' => $params['check'],
-						'content' => $params['content'],
+						'content' => $params['content'] ?? '',
 						'create_time' => time()
 					);
 					Db::name('oa_flow_record')->strict(false)->field(true)->insertGetId($checkData);
@@ -536,7 +530,7 @@
 						'type' => 3,
 						'check_time' => time(),
 						'status' => $params['check'],
-						'content' => $params['content'],
+						'content' => $params['content'] ?? '',
 						'create_time' => time()
 					);
 					Db::name('oa_flow_record')->strict(false)->field(true)->insertGetId($checkData);
@@ -655,7 +649,7 @@
 						'type' => 3,
 						'check_time' => time(),
 						'status' => $params['check'],
-						'content' => $params['content'],
+						'content' => $params['content'] ?? '',
 						'create_time' => time()
 					);
 					Db::name('oa_flow_record')->strict(false)->field(true)->insertGetId($checkData);