From e2aa651db9f17d58819329de571037edc0f9eba2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 23 六月 2025 18:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index ec9ce02..98b1105 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -104,18 +104,16 @@
@ApiModelProperty("瀵煎嚭鍥炴鐧昏")
@PostMapping("/export")
- public void export(HttpServletResponse response, @RequestParam("ids") String idsStr) {
- if (idsStr == null || idsStr.trim().isEmpty()) {
- throw new RuntimeException("璇烽�夋嫨瑕佸鍑虹殑璁板綍");
+ public void export(HttpServletResponse response, String ids) {
+ if (ids == null || ids.isEmpty()) {
+ receiptPaymentService.exportPaymentList(response, null);
+ } else {
+ ArrayList<Long> idList = (ArrayList<Long>) Arrays.stream(ids.split(","))
+ .map(s -> s.replaceAll("[\\[\\]]", "").trim())
+ .map(Long::valueOf)
+ .collect(Collectors.toList());
+ receiptPaymentService.exportPaymentList(response, idList);
}
-
- ArrayList<Long> ids = (ArrayList<Long>) Arrays.stream(idsStr.split(","))
- .map(s -> s.replaceAll("[\\[\\]]", "").trim())
- .map(Long::valueOf)
- .collect(Collectors.toList());
-
-
- receiptPaymentService.exportPaymentList(response, ids);
}
--
Gitblit v1.9.3