From 6831e7b977681e3f6a1c619e13c2fe28e7ccc49d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 02 七月 2025 10:36:31 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLocationServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLocationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLocationServiceImpl.java
index 544e603..c8dfefa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLocationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLocationServiceImpl.java
@@ -37,13 +37,20 @@
List<LocationListVO> list = this.baseMapper.pageList(query,pageInfo);
for (LocationListVO locationListVO : list) {
TCleaner tCleaner = cleanerMapper.selectById(locationListVO.getLocationCleaner());
- TProjectDept tProjectDept = projectDeptMapper.selectById(tCleaner.getProjectId());
- if (!tProjectDept.getParentId().equals("0")){
- TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
- locationListVO.setProjectName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
- }else{
- locationListVO.setProjectName(tProjectDept.getProjectName());
+ if (tCleaner!=null){
+ TProjectDept tProjectDept = projectDeptMapper.selectById(tCleaner.getProjectId());
+ if (tProjectDept!=null){
+ if (!tProjectDept.getParentId().equals("0")){
+ TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
+ if (tProjectDept1!=null)
+ locationListVO.setProjectName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ }else{
+ locationListVO.setProjectName(tProjectDept.getProjectName());
+ }
+ }
+
}
+
}
pageInfo.setRecords(list);
return pageInfo;
--
Gitblit v1.7.1