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/account/controller/AccountReconciliationController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java b/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java
index 77ceec9..e608e9c 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountReconciliationController.java
@@ -70,8 +70,8 @@
*/
@GetMapping("/page")
@ApiOperation("鍒嗛〉鏌ヨ")
- public AjaxResult accountListPage(Page page) {
- return AjaxResult.success(accountReconciliationService.page(page));
+ public AjaxResult accountReconciliationListPage(Page page,AccountReconciliation accountReconciliation) {
+ return AjaxResult.success(accountReconciliationService.accountReconciliationListPage(page, accountReconciliation));
}
--
Gitblit v1.9.3