From 255b88a94814059d5984aa94f0a95492f1894c71 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 30 Jan 2026 09:54:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/order/HardOrderTotalController.java | 2 +- .../service/impl/order/HardOrderTotalServiceImpl.java | 10 ++++++++-- .../recharge/WalletRechargeImportController.java | 2 +- .../mapper/recharge/WalletRechargeImportMapper.xml | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java index d762284c5..91d163b71 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java @@ -269,7 +269,7 @@ public class HardOrderTotalController { if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("商户不存在"); Long count = hardOrderMapper.count(dto, DataScope.of()); - if (count > 10 * 10000) throw new RuntimeException("导出数据超出100000条，请缩小查询范围"); + if (count > 5 * 10000) throw new RuntimeException("导出数据超出100000条，请缩小查询范围"); try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(ResourceUtil.getStream("file/商户交易流水导出.xlsx")).build()) { WriteSheet writeSheet = EasyExcel.writerSheet().build(); diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java index 644264777..caf10e3b3 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java @@ -232,7 +232,10 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { if (ObjectUtil.isNotEmpty(deptMap)) { for (HardOrderCsVo v : totalList) { if (ObjectUtil.isEmpty(v.getMerchantDeptId())) continue; - v.setMerchantDeptName(deptMap.get(v.getMerchantDeptId()).getName()); + SysDept targetDept = deptMap.get(v.getMerchantDeptId()); + if (ObjectUtil.isNotEmpty(targetDept)) { + v.setMerchantDeptName(targetDept.getName()); + } } } } @@ -328,7 +331,10 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { if (ObjectUtil.isNotEmpty(deptMap)) { for (HardOrderCsVo v : totalList) { if (ObjectUtil.isEmpty(v.getMerchantDeptId())) continue; - v.setMerchantDeptName(deptMap.get(v.getMerchantDeptId()).getName()); + SysDept targetDept = deptMap.get(v.getMerchantDeptId()); + if (ObjectUtil.isNotEmpty(targetDept)) { + v.setMerchantDeptName(targetDept.getName()); + } } } } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java index 4f96418b2..4ae568f40 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java @@ -114,7 +114,7 @@ public class WalletRechargeImportController { @ResponseExcel @PostMapping("/export") - @PreAuthorize("@pms.hasPermission('wallet_walletRechargeImport_export')") + @PreAuthorize("@pms.hasPermission('wallet_walletRechargeApply_export')") public void export(HttpServletResponse response, @RequestBody WalletRechargeImportDto dto) throws IOException { DataScope dataScope = DataScope.of(); Long count = walletRechargeImportMapper.count(dto, dataScope); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml index 72b3155c4..92fbfbb38 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml @@ -113,7 +113,7 @@