From d0f0b47215dcbfbc654fc5191140fccacd43d50f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 21:40:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLocationServiceImpl.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 c8dfefa..1d08b03 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,21 +36,16 @@
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());
- 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());
- }
+ 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;
--
Gitblit v1.7.1