diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java index 8720e6163..0d08b5de8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java @@ -50,7 +50,7 @@ public interface WorkerAttendanceMapper extends BaseMapper { * @param map * @return */ - List selectWorkerAttendancePage(Page page, @Param("param") Map map); + Page selectWorkerAttendancePage(Page page, @Param("param") Map map); /** * 列表查询人员考勤信息 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java index 8e2240943..12fb83b2e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java @@ -239,8 +239,8 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); - List list = workerAttendanceMapper.selectWorkerAttendancePage(page, map); - return page.setRecords(list); + Page pageList = workerAttendanceMapper.selectWorkerAttendancePage(page, map); + return pageList; } @Override