From e95420c9ea8b800a61f34b56a202204faff13b79 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 5 Jul 2025 15:23:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AE=A1=E6=89=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/recharge/WalletRechargeBindInvoiceDto.java       | 5 ++---
 .../controller/recharge/WalletRechargeInvoiceController.java | 2 +-
 .../impl/recharge/WalletRechargeInvoiceServiceImpl.java      | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeBindInvoiceDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeBindInvoiceDto.java
index 48c5058b5..99c7f91bb 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeBindInvoiceDto.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeBindInvoiceDto.java
@@ -1,8 +1,7 @@
 package com.bsd.pjcloud.wallet.api.dto.recharge;
 
-import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeInvoiceVo;
+import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeInvoiceEntity;
 import lombok.Data;
-import org.apache.commons.math3.optim.nonlinear.scalar.LineSearch;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -11,7 +10,7 @@ import java.util.List;
  * 充值记录绑定发票
  */
 @Data
-public class WalletRechargeBindInvoiceDto extends WalletRechargeInvoiceVo {
+public class WalletRechargeBindInvoiceDto extends WalletRechargeInvoiceEntity {
 
     /**
      * 充值/扣款申请id
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java
index e499b6c28..37c5cbc50 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java
@@ -95,7 +95,7 @@ public class WalletRechargeInvoiceController {
     public R getWalletRechargeInvoicePage(@ParameterObject Page page, @ParameterObject WalletRechargeBindInvoiceDto dto) {
         DataScope dataScope = DataScope.of();
         dataScope.setScopeDeptName("apply_dept_id");
-        dto.setIsCheckUser(true);
+        dto.setIsFindUserCheck(true);
         return R.ok(walletRechargeInvoiceService.scopePageList(page, dto, dataScope));
     }
 
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
index b41a9d010..df98d61f3 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
@@ -448,6 +448,7 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
     }
 
     private void disposeList(List<WalletRechargeInvoiceVo> list, WalletRechargeBindInvoiceDto dto) {
+        if (ObjectUtil.isEmpty(list)) return;
         // 审批流程
         if (dto.getIsFindUserCheck()) {
             List<String> processInstanceIds = list.stream().map(WalletRechargeInvoiceVo::getProcessId).filter(ObjectUtil::isNotEmpty).distinct().toList();