Merge remote-tracking branch 'origin/master'

yaowanxin

昨天 e2aa651db9f17d58819329de571037edc0f9eba2

 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("请选择要导出的记录");
        }

        ArrayList<Long> ids = (ArrayList<Long>) Arrays.stream(idsStr.split(","))
    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, ids);
            receiptPaymentService.exportPaymentList(response, idList);
        }
    }