1.1.21 开票信息加合同ID条件筛选

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpFinInvoiceInfoServiceImpl.java

@@ -135,6 +135,7 @@ public class ErpFinInvoiceInfoServiceImpl extends AbstractWorkflowService<ErpFin
                 .eq(StringUtils.isNotBlank(bo.getInvoiceCategory()), ErpFinInvoiceInfo::getInvoiceCategory, bo.getInvoiceCategory())
                 .like(StringUtils.isNotBlank(bo.getCustomerName()), ErpFinInvoiceInfo::getCustomerName, bo.getCustomerName())
                 .eq(StringUtils.isNotBlank(bo.getEarlyFlag()), ErpFinInvoiceInfo::getEarlyFlag, bo.getEarlyFlag())
+                .eq(StringUtils.isNotNull(bo.getContractId()), ErpFinInvoiceInfo::getContractId, bo.getContractId())
                 .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpFinInvoiceInfo::getFlowStatus, bo.getFlowStatus())
                 .eq(StringUtils.isNotBlank(bo.getInvoiceStatus()), ErpFinInvoiceInfo::getInvoiceStatus, bo.getInvoiceStatus())
                 .orderByDesc("invoice_id");