From 70eeb9f0f3c06787d05f8012bba6d0b4ebbea9ad Mon Sep 17 00:00:00 2001
From: gejunhao <1421207006@qq.com>
Date: Fri, 20 Dec 2024 17:08:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=A4=E7=A9=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HuzhouPlaninfoServiceImpl.java       | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java
index facb522..1318114 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java
@@ -423,7 +423,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
                 .stream().map(HuzhouSubProjectinfo::getId)
                 .collect(Collectors.toList());
         log.info("该主项目id为:{} 子项目数量为:{} 子项目id集合为:{}", projectId,subProjectIds.size(),subProjectIds);
-        return CollectionUtils.isNotEmpty(subProjectIds) ? subProjectIds : new ArrayList<>();
+        return CollectionUtils.isNotEmpty(subProjectIds) ? subProjectIds : Collections.emptyList();
     }
 
     @Override
@@ -1201,25 +1201,30 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
 
     @Override
     public List<TaskLevelDetailVo> queryTaskLevelDetail(String projectid, String taskLevel) {
-        // 获取子项目id集合
+        // 1.获取子项目id集合
         List<String> subProjectIds = getSubProjectIds(projectid);
         List<TaskLevelDetailVo> result = new ArrayList<>();
-        // 构造查询条件
+
+        // 2.构造查询条件
         LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(HuzhouPlaninfo::getProjectId,projectid)
-                .eq(HuzhouPlaninfo::getTaskLevel,taskLevel);
-        // 封装子项目阶段详情信息
-        if (CollectionUtil.isNotEmpty(subProjectIds)){
+        queryWrapper.eq(StringUtils.isNotBlank(projectid), HuzhouPlaninfo::getProjectId, projectid)
+                .eq(StringUtils.isNotBlank(taskLevel), HuzhouPlaninfo::getTaskLevel, taskLevel);
+
+        // 3.封装子项目阶段详情信息
+        if (CollectionUtil.isNotEmpty(subProjectIds)) {
             for (String subProjectId : subProjectIds) {
                 TaskLevelDetailVo subTaskLevelDetailVo = new TaskLevelDetailVo();
                 HuzhouPlaninfo subPlanInfo = this.getOne(queryWrapper);
                 HuzhouProjectinfo subProjectInfo = subProjectinfoService.getById(subProjectId);
-                String projectName = subProjectInfo.getProjectName();
-                subTaskLevelDetailVo.setProjectName(projectName);
-                subTaskLevelDetailVo.setIsFinish(subPlanInfo.getIsfinish());
-                subTaskLevelDetailVo.setSubProjectId(subProjectId);
-                result.add(subTaskLevelDetailVo);
-                log.info("子项目名称:{} 阶段:{} 完成状态:{} id:{}",projectName,subPlanInfo.getTaskLevel(),subPlanInfo.getIsfinish(),subProjectId);
+                // 4.不为空则封装返回
+                if (subPlanInfo != null) {
+                    String projectName = subProjectInfo.getProjectName();
+                    subTaskLevelDetailVo.setProjectName(projectName);
+                    subTaskLevelDetailVo.setIsFinish(subPlanInfo.getIsfinish());
+                    subTaskLevelDetailVo.setSubProjectId(subProjectId);
+                    result.add(subTaskLevelDetailVo);
+                    log.info("子项目名称:{} 阶段:{} 完成状态:{} id:{}", projectName, subPlanInfo.getTaskLevel(), subPlanInfo.getIsfinish(), subProjectId);
+                }
             }
         }
         return result;