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/TLocationServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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..ee4ab08 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
@@ -36,16 +36,23 @@
PageInfo<LocationListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
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());
+ TProjectDept tProjectDept = projectDeptMapper.selectById(locationListVO.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;
}
+
+ @Override
+ public List<TLocation> locationList() {
+ return null;
+ }
}
--
Gitblit v1.7.1