| | |
|---|
| | | 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{ |
|---|
| | |
|---|
| | | 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); |
|---|
