From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
index 20e23e5..1fbb4db 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
@@ -53,6 +53,7 @@
.eq(null != query.getStatus(),TInvoice::getStatus,query.getStatus())
.ge(StringUtils.isNotEmpty(query.getInvoiceStartTime()),TInvoice::getInvoiceTime,query.getInvoiceStartTime())
.le(StringUtils.isNotEmpty(query.getInvoiceEndTime()),TInvoice::getInvoiceTime,query.getInvoiceEndTime())
+ .eq(StringUtils.isNotEmpty(query.getBusinessDeptId())&& ! "0".equals(query.getBusinessDeptId()),TInvoice::getBusinessDeptId,query.getBusinessDeptId())
.orderByDesc(TInvoice::getCreateTime);
return this.baseMapper.selectList(queryWrapper);
}
@@ -73,8 +74,6 @@
tInvoice.setInvoiceVoucherName(query.getInvoiceVoucherName());
tInvoice.setInvoiceTime(query.getInvoiceTime());
tInvoice.setStatus(2);
-
-
// 异步发送邮件
CompletableFuture.runAsync(() -> {
try {
@@ -83,7 +82,6 @@
log.error("邮件发送失败", e);
}
});
-
// 更新数据库
return updateById(tInvoice);
}
--
Gitblit v1.7.1