From 1c518e10a50050d383e714b581c94dea58ec4d67 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 18:01:34 +0800
Subject: [PATCH] fix(approve): 修复审批实例查询条件及流程控制问题

---
 src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
index f392d66..46588d1 100644
--- a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
+++ b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
@@ -5,17 +5,16 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.staff.dto.StaffOnJobDto;
 import com.ruoyi.staff.pojo.StaffContract;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
 import com.ruoyi.staff.pojo.StaffOnJob;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 public interface IStaffOnJobService extends IService<StaffOnJob> {
 
 
-    IPage<StaffOnJobDto> staffOnJobListPage(Page page, StaffOnJob staffOnJob);
+    IPage<StaffOnJobDto> staffOnJobListPage(Page page, StaffOnJobDto staffOnJob);
 
      StaffOnJobDto staffOnJobDetail(Long id);
 
@@ -29,7 +28,7 @@
 
     void staffOnJobExport(HttpServletResponse response, StaffOnJob staffOnJob);
 
-    List<StaffJoinLeaveRecord> staffOnJobList();
+    List<StaffOnJobDto> staffOnJobList(StaffOnJob staffOnJob);
 
     Boolean importData(MultipartFile file);
 

--
Gitblit v1.9.3