From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceInvoiceServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceInvoiceServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceInvoiceServiceImpl.java
index a5539db..96b68f5 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceInvoiceServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceInvoiceServiceImpl.java
@@ -65,6 +65,12 @@
if (StringUtils.isNotBlank(serviceInvoice.getRemark())) {
wrappers.like(ServiceInvoice::getRemark, serviceInvoice.getRemark());
}
+ if (StringUtils.isNotBlank(serviceInvoice.getReimburseState())) {
+ wrappers.eq(ServiceInvoice::getReimburseState, serviceInvoice.getReimburseState());
+ }
+ if (StringUtils.isNotBlank(serviceInvoice.getReimburseId())) {
+ wrappers.eq(ServiceInvoice::getReimburseId, serviceInvoice.getReimburseId());
+ }
wrappers.orderByDesc(ServiceInvoice::getCreateTime).orderByDesc(ServiceInvoice::getId);
return this.list(wrappers);
}
--
Gitblit v1.9.3