From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
index 02fb59c..7ff668d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.TencentMailUtil;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.model.TBill;
@@ -45,6 +46,7 @@
@ApiOperation(value = "获取开票列表")
@PostMapping("/list")
public R<PageInfo<TInvoice>> list(@RequestBody TInvoiceQuery query) {
+ query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
return R.ok(invoiceService.pageList(query));
}
@@ -86,7 +88,7 @@
String fileName = voucherNames[i];
Map<String, String> attachment = new HashMap<>(2); // 初始容量为2，避免扩容
String tempDir = System.getProperty("java.io.tmpdir");
- Path filePath = Paths.get(tempDir, fileName);
+ Path filePath = Paths.get(tempDir, "invoice");
// 保存到临时目录
tencentCosUtil.download(voucherUrl,filePath.toString(),fileName);
--
Gitblit v1.7.1