From f287dfb5249618bf821626e76b7ce8d8f74d6b99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 02 七月 2025 16:15:12 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java
index 2801899..23c539b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java
@@ -66,7 +66,10 @@
}
}else{
TDept tDept = deptMapper.selectById(sysUser.getDeptId());
- temp.setDeptName(tDept.getDeptName());
+ if (tDept != null){
+ temp.setDeptName(tDept.getDeptName());
+
+ }
}
}
TTaskDetail tTaskDetail = tTaskDetails.stream().filter(e -> e.getTaskId().equals(temp.getId())).findFirst().orElse(null);
@@ -120,5 +123,12 @@
return pageInfo;
}
+ @Override
+ public List<ProgressListVO> taskProgressExport(TaskProgressQuery query) {
+ List<ProgressListVO> list = this.baseMapper.taskProgressExport(query);
+
+ return list;
+ }
+
}
--
Gitblit v1.7.1