Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 22d0531ef01ace7a66a0c5cc3e313944fe2ec8b4

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java

@@ -2,7 +2,12 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.documents4j.api.IFileConsumer;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.applet.query.LeaveListUserQuery;
import com.ruoyi.system.applet.vo.LeaveUserListVO;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.TDeptMapper;
import com.ruoyi.system.mapper.TLeaveMapper;
import com.ruoyi.system.mapper.TProjectDeptMapper;
@@ -36,6 +41,8 @@
    private TProjectDeptMapper projectDeptMapper;
    @Autowired
    private TDeptMapper deptMapper;
    @Autowired
    private SysUserMapper sysUserMapper;
    @Override
    public PageInfo<LeaveListVO> pageList(LeaveListQuery query) {
        if (StringUtils.hasLength(query.getDeptName())){
@@ -58,7 +65,7 @@
            leaveListVO.setLeaveTime(start+"至"+end);
            if (leaveListVO.getDeptType() == 1){
                TProjectDept tProjectDept = projectDeptMapper.selectById(leaveListVO.getDeptId());
                if (!tProjectDept.getParentId().equals("0")){
                if (!"0".equals(tProjectDept.getParentId())){
                    TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
                    leaveListVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
                }else{
@@ -72,4 +79,29 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public PageInfo<LeaveUserListVO> leaveList(LeaveListUserQuery query) {
        List<SysUser> sysUsers = sysUserMapper.selectAllList();
        if (StringUtils.hasLength(query.getLeavePersonName())){
            List<Long> collect = sysUsers.stream().filter(e -> e.getNickName().contains(query.getLeavePersonName()))
                    .map(SysUser::getUserId).collect(Collectors.toList());
            if (collect.isEmpty()){
                collect.add(0L);
            }
            query.setUserIds(collect);

        }
        PageInfo<LeaveUserListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<LeaveUserListVO> list = this.baseMapper.leaveList(query,pageInfo);
        for (LeaveUserListVO leaveUserListVO : list) {
            SysUser sysUser = sysUsers.stream().filter(e -> (e.getUserId() + "").equals(leaveUserListVO.getLeavePerson()))
                    .findFirst().orElse(null);
            if (sysUser!=null){
                leaveUserListVO.setLeavePersonName(sysUser.getNickName());
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
}