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/warehouse/controller/DocumentationFileController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
index 71df814..13a1bc7 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
@@ -39,7 +39,7 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delDocumentationFile(@RequestBody List<Integer> ids) {
+ public AjaxResult delDocumentationFile(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
@@ -48,14 +48,14 @@
}
/**
- *鍒嗛〉鏌ヨ
- * @param page
+ *鏌ヨ
+ * @param
* @param documentationFile
* @return
*/
@GetMapping("/listPage")
- public AjaxResult documentationFileListPage(Page page, DocumentationFile documentationFile) {
- return AjaxResult.success(documentationFileService.documentationFileListPage(page, documentationFile));
+ public AjaxResult documentationFileListPage(DocumentationFile documentationFile) {
+ return AjaxResult.success(documentationFileService.documentationFileListPage( documentationFile));
}
--
Gitblit v1.9.3