From 28f9605441cdda5bd9cfabd2241ff8509a4a8888 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 20 十月 2025 18:48:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalTodoServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 503c9d6..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
@@ -2,17 +2,25 @@
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;
import com.ruoyi.system.mapper.OaApprovalTodoMapper;
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;
@@ -31,10 +39,11 @@
*/
@Service
@RequiredArgsConstructor
+@Slf4j
public class OaApprovalTodoServiceImpl extends ServiceImpl<OaApprovalTodoMapper, OaApprovalTodo> implements OaApprovalTodoService {
private final ISysUserService sysUserService;
- private final ISysDeptService sysDeptService;
+ private final TDeptService deptService;
/**
* 创建审批待办（公共实现）
@@ -62,6 +71,23 @@
}
}
+ @Override
+ 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;
+ }
+
+
/**
* 创建上级部门审批待办
*/
@@ -71,7 +97,7 @@
throw new ServiceException("未填写申请部门信息");
}
- SysDept currentDept = sysDeptService.selectDeptById(Long.valueOf(deptId));
+ TDept currentDept = deptService.getById(Long.valueOf(deptId));
if (currentDept == null) {
throw new ServiceException("申请部门信息不存在");
}
@@ -81,13 +107,13 @@
throw new ServiceException("当前部门没有上级部门");
}
- SysDept parentDept = sysDeptService.selectDeptById(currentDept.getParentId());
+ TDept parentDept = deptService.getById(currentDept.getParentId());
if (parentDept == null) {
throw new ServiceException("上级部门信息不存在");
}
// 3. 查询所有关联了该上级部门的用户
- List<SysUser> users = sysUserService.selectListByDeptId(parentDept.getDeptId().toString());
+ List<SysUser> users = sysUserService.selectListByDeptId(parentDept.getId().toString());
if (CollUtil.isEmpty(users)) {
throw new ServiceException("上级部门下没有找到用户");
}
--
Gitblit v1.7.1