feat:bug修改

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();

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());
+                        }
                     }
                 }
             }

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);

pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml

@@ -113,7 +113,7 @@
     </select>
 
     <select id="count" resultType="java.lang.Long">
-        count(0)
+        select count(*)
         from wallet_recharge_import a
         inner join wallet_recharge_apply p on p.id = a.apply_id
         <where>