diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java index 66f2b240a..a834e828c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java @@ -114,6 +114,8 @@ public class PurchaseServiceImpl implements PurchaseService { PurchaseRecordDO purchaseRecordDO = purchaseRecordMapper.selectOne(new LambdaQueryWrapper() .eq(PurchaseRecordDO::getOrganId, organId) .gt(PurchaseRecordDO::getEndTime, LocalDateTime.now()) + .eq(PurchaseRecordDO::getDeleted, false) + .eq(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.ACTIVE.getStatus()) .orderByDesc(PurchaseRecordDO::getCreateTime) .last("limit 1")); if (ObjectUtil.isNotNull(purchaseRecordDO)) { diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml index ad9ad4d2d..ce8083459 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml @@ -3,7 +3,7 @@ @@ -12,7 +12,7 @@ sum(case when is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@PENDINGINVOICING.code}' then account_balance_spent else 0 end) as inTheInvoice, sum(case when is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICINGSUCCESSFUL.code}' then account_balance_spent else 0 end) as invoiced from purchase_record - where organ_id = #{organId} + where organ_id = #{organId} and deleted = false;