无关风月
17 小时以前 d38daf71ef496cd5788c955192ec5ed003fc6d8c
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalTodoServiceImpl.java
@@ -2,17 +2,24 @@
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 org.apache.commons.lang3.StringUtils;
import org.springframework.security.core.token.TokenService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -34,7 +41,7 @@
public class OaApprovalTodoServiceImpl extends ServiceImpl<OaApprovalTodoMapper, OaApprovalTodo> implements OaApprovalTodoService {
    private final ISysUserService sysUserService;
    private final ISysDeptService sysDeptService;
    private final TDeptService deptService;
    /**
     * 创建审批待办(公共实现)
@@ -62,6 +69,15 @@
        }
    }
    @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;
    }
    /**
     * 创建上级部门审批待办
     */
@@ -71,7 +87,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 +97,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("上级部门下没有找到用户");
        }