From 67e7b5fc821a35f013e7a46a5957f4c6394d236d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 24 十月 2025 18:14:51 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalTodoServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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..654a416 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
@@ -3,7 +3,6 @@
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.common.exception.ServiceException;
@@ -11,15 +10,12 @@
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.model.OaApprovalTodo;
import com.ruoyi.system.query.ApprovalTodoListQuery;
-import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.OaApprovalTodoService;
import com.ruoyi.system.service.TDeptService;
-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;
import org.springframework.transaction.annotation.Transactional;
@@ -38,6 +34,7 @@
*/
@Service
@RequiredArgsConstructor
+@Slf4j
public class OaApprovalTodoServiceImpl extends ServiceImpl<OaApprovalTodoMapper, OaApprovalTodo> implements OaApprovalTodoService {
private final ISysUserService sysUserService;
@@ -73,6 +70,14 @@
public PageInfo<OaApprovalTodo> pageList(ApprovalTodoListQuery query) {
PageInfo<OaApprovalTodo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<OaApprovalTodo> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords( list);
+ 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;
}
@@ -175,4 +180,9 @@
//批量保存
this.saveBatch(approvalTodoList);
}
+
+ @Override
+ public void deleteByApplicationId(Integer id) {
+ lambdaUpdate().eq(OaApprovalTodo::getApplicationId, id).remove();
+ }
}
--
Gitblit v1.7.1