From 53d014edd19f57125c355abe71ec5b478500e610 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 09:57:40 +0800
Subject: [PATCH] 保洁巡检所有代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
index d0ee0a8..a645780 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
@@ -45,6 +45,7 @@
private SysUserMapper sysUserMapper;
@Override
public PageInfo<LeaveListVO> pageList(LeaveListQuery query) {
+ List<SysUser> sysUsers = sysUserMapper.selectAllList();
if (StringUtils.hasLength(query.getDeptName())){
List<String> collect = projectDeptMapper.selectList(new LambdaQueryWrapper<TProjectDept>().like(TProjectDept::getProjectName, query.getDeptName()))
.stream().map(TProjectDept::getId).collect(Collectors.toList());
@@ -60,20 +61,31 @@
PageInfo<LeaveListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<LeaveListVO> list = this.baseMapper.pageList(query,pageInfo);
for (LeaveListVO leaveListVO : list) {
+ SysUser sysUser = sysUsers.stream().filter(e -> e.getUserId().equals(Long.valueOf(leaveListVO.getAuditId()))).findFirst().orElse(null);
+ if (sysUser!=null){
+ leaveListVO.setAuditName(sysUser.getNickName());
+ }
String start = leaveListVO.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String end = leaveListVO.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
leaveListVO.setLeaveTime(start+"至"+end);
if (leaveListVO.getDeptType() == 1){
TProjectDept tProjectDept = projectDeptMapper.selectById(leaveListVO.getDeptId());
- if (!"0".equals(tProjectDept.getParentId())){
+ if (tProjectDept!=null&&!"0".equals(tProjectDept.getParentId())){
TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
- leaveListVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ if (tProjectDept1!=null){
+ leaveListVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ }
}else{
- leaveListVO.setDeptName(tProjectDept.getProjectName());
+ if (tProjectDept!=null){
+ leaveListVO.setDeptName(tProjectDept.getProjectName());
+ }
}
}else{
TDept tDept = deptMapper.selectById(leaveListVO.getDeptId());
- leaveListVO.setDeptName(tDept.getDeptName());
+ if (tDept!=null){
+ leaveListVO.setDeptName(tDept.getDeptName());
+
+ }
}
}
pageInfo.setRecords(list);
--
Gitblit v1.7.1