From a3a6cfefc062b2c2d0a3c96da36054dfae973b91 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Sun, 28 Sep 2025 09:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E9=99=84=E4=BB=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/controller/FinPaymentApplyController.php | 12 ++++++++----
 app/common/controller/FinReceiptController.php      | 11 ++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/common/controller/FinPaymentApplyController.php b/app/common/controller/FinPaymentApplyController.php
index d8158fa..8739043 100644
--- a/app/common/controller/FinPaymentApplyController.php
+++ b/app/common/controller/FinPaymentApplyController.php
@@ -55,9 +55,11 @@ class FinPaymentApplyController extends BaseController
                 ];
             }
         }
-        $data['voucher_file_full'] = '';
-        if (!empty($data['voucher_file']))
+        if (!empty($data['voucher_file'])) {
             $data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
+        } elseif (isset($data['voucher_file'])) {
+            $data['voucher_file_full'] = '';
+        }
         if (isset($data['created_at']))
             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
         if (isset($data['updated_at']))
@@ -96,9 +98,11 @@ class FinPaymentApplyController extends BaseController
                 ];
             }
         }
-        $data['voucher_file_full'] = '';
-        if (!empty($data['voucher_file']))
+        if (!empty($data['voucher_file'])) {
             $data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
+        } elseif (isset($data['voucher_file'])) {
+            $data['voucher_file_full'] = '';
+        }
         if (isset($data['created_at']))
             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
         if (isset($data['updated_at']))
diff --git a/app/common/controller/FinReceiptController.php b/app/common/controller/FinReceiptController.php
index 3dcdf72..76b1ed8 100644
--- a/app/common/controller/FinReceiptController.php
+++ b/app/common/controller/FinReceiptController.php
@@ -42,9 +42,11 @@ class FinReceiptController extends BaseController
              $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
          if (isset($data['currency_id'])) //付款币种
              $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
-         $data['fx_receipt_file_full'] = '';
-         if (!empty($data['fx_receipt_file']))
+         if (!empty($data['fx_receipt_file'])){
              $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
+         }elseif (isset($data['fx_receipt_file'])){
+             $data['fx_receipt_file_full'] = '';
+         }
          return $data;
      }
 
@@ -70,8 +72,11 @@ class FinReceiptController extends BaseController
             $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
         if (isset($data['currency_id'])) //付款币种
             $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
-        if (isset($data['fx_receipt_file']))
+        if (!empty($data['fx_receipt_file'])) {
             $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
+        } elseif (isset($data['fx_receipt_file'])) {
+            $data['fx_receipt_file_full'] = '';
+        }
         return $data;
     }
 }
\ No newline at end of file