xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/fin' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-10-30 18:49:33 +08:00
parent 2e85b46a3d 206eff87e2
commit b4ce4fe672
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/FinPaymentApplyService.php
+4 -4
View File
@@ -91,9 +91,9 @@ class FinPaymentApplyService
$data['submit_files'] = json_encode($data['submit_files']);
redis::set('stock_' . $data['doc_user_id'], json_encode($request->post('stock')), 'EX', 30);
unset($data['stock']);
if($data['voucher_file'] == '[]' || $data['voucher_file'] == '{}' )
if($data['voucher_file'] == '[]' || $data['voucher_file'] == '{}' || $data['voucher_file'] == '""')
$data['voucher_file'] = '';
if($data['submit_files'] == '[]' || $data['submit_files'] == '{}' )
if($data['submit_files'] == '[]' || $data['submit_files'] == '{}' || $data['submit_files'] == '""')
$data['submit_files'] = '';
return $data;
}
@@ -119,10 +119,10 @@ class FinPaymentApplyService
{
unset($data['stock']);
$data['submit_files'] = json_encode($data['submit_files']);
if($data['submit_files'] == '[]' || $data['submit_files'] == '{}' )
if($data['submit_files'] == '[]' || $data['submit_files'] == '{}' || $data['submit_files'] == '""')
$data['submit_files'] = '';
$data['voucher_file'] = json_encode($data['voucher_file']);
if($data['voucher_file'] == '[]' || $data['voucher_file'] == '{}' )
if($data['voucher_file'] == '[]' || $data['voucher_file'] == '{}' || $data['voucher_file'] == '""')
$data['voucher_file'] = '';
return $data;
}
app/common/service/FinReceiptService.php
+2 -2
View File
@@ -115,7 +115,7 @@ class FinReceiptService
$data['created_by'] = $request->user->uid;
$data['updated_by'] = $request->user->uid;
$data['fx_receipt_file'] = json_encode($data['fx_receipt_file']);
if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' )
if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' || $data['fx_receipt_file'] == '""')
$data['fx_receipt_file'] = '';
return $data;
}
@@ -137,7 +137,7 @@ class FinReceiptService
$data['received_at'] = strtotime($data['received_at']);
$data['fx_receipt_file'] = json_encode($data['fx_receipt_file']);
if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' )
if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' || $data['fx_receipt_file'] == '""')
$data['fx_receipt_file'] = '';
return $data;
}