fix:审批bug

This commit is contained in:
dzc committed 2025-07-05 15:23:23 +08:00
1 parent 7c24652045
commit e95420c9ea
3 files changed
+4 -4

No files matched your search

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