From 030201887b4690e20b1f9ffae548ccd840e7077f Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 26 九月 2025 15:23:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalTodoServiceImpl.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalTodoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalTodoServiceImpl.java index da7af41..82ba9ee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalTodoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalTodoServiceImpl.java @@ -18,6 +18,7 @@ import com.ruoyi.system.vo.ApprovalTodoVO; import com.ruoyi.system.vo.system.NotificationVO; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.security.core.token.TokenService; import org.springframework.stereotype.Service; @@ -38,6 +39,7 @@ */ @Service @RequiredArgsConstructor +@Slf4j public class OaApprovalTodoServiceImpl extends ServiceImpl<OaApprovalTodoMapper, OaApprovalTodo> implements OaApprovalTodoService { private final ISysUserService sysUserService; @@ -77,6 +79,14 @@ return pageInfo; } + @Override + public PageInfo<OaApprovalTodo> pageListAudit(ApprovalTodoListQuery query) { + PageInfo<OaApprovalTodo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<OaApprovalTodo> list = this.baseMapper.pageListAudit(query,pageInfo); + pageInfo.setRecords( list); + return pageInfo; + } + /** * 创建上级部门审批待办 -- Gitblit v1.7.1