From 70409bf0d1bef6876916faf6a4ce24f3e797ec32 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 22 十月 2026 14:19:31 +0800
Subject: [PATCH] fix(人力): 在职员工台账默认不再按合同到期日过滤(可显示全部在职员工)；入职同步写入入职日期；修复离职状态过滤失效
---
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index 2f680d5..4dcb6cf 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -382,6 +382,12 @@
}
queryWrapper.eq(TicketRegistration::getTenantId, SecurityUtils.getLoginUser().getTenantId())
.eq(TicketRegistration::getDeleteFlag,0);
+ if (ticketRegistration.getInvoiceAmountStart() != null) {
+ queryWrapper.ge(TicketRegistration::getInvoiceAmount, ticketRegistration.getInvoiceAmountStart());
+ }
+ if (ticketRegistration.getInvoiceAmountEnd() != null) {
+ queryWrapper.le(TicketRegistration::getInvoiceAmount, ticketRegistration.getInvoiceAmountEnd());
+ }
IPage<TicketRegistration> ticketRegistrationIPage = ticketRegistrationMapper.selectPage(page, queryWrapper);
// 璁＄畻宸蹭粯娆鹃噾棰�
if (CollectionUtils.isNotEmpty(ticketRegistrationIPage.getRecords())) {
--
Gitblit v1.9.3