From 8fbc1f5aa2a7c1d146e6d17a9dc7e6d27bff1e8e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 24 Oct 2025 16:05:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(oa):=E4=BF=AE=E5=A4=8D=E5=A5=96=E9=87=91?= =?UTF-8?q?=E6=B1=A0=E6=9C=8D=E5=8A=A1=E4=B8=AD=E8=BF=9B=E5=BA=A6=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E6=94=B6=E9=9B=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除多余的空行以优化代码格式- 在收集进度ID时增加对null值的过滤 -修复进度步骤负责人昵称过滤逻辑，确保过滤null和空字符串- 保证进度负责人收集的准确性和完整性 --- .../com/ruoyi/oa/service/impl/OaBonusPoolServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusPoolServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusPoolServiceImpl.java index 04226a0..fb0be41 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusPoolServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusPoolServiceImpl.java @@ -181,7 +181,6 @@ public class OaBonusPoolServiceImpl implements IOaBonusPoolService { .eq(OaProjectSchedule::getDelFlag, "0") .select(OaProjectSchedule::getScheduleId) ); - // 收集进度负责人（oa_project_schedule_step.header） if (CollUtil.isEmpty(schedules)) { Log.warn("项目ID对应的进度主表记录为空，仅收集项目负责人"); @@ -189,6 +188,7 @@ public class OaBonusPoolServiceImpl implements IOaBonusPoolService { List scheduleIds = schedules.stream() .filter(Objects::nonNull) // 过滤null进度对象 .map(OaProjectSchedule::getScheduleId) + .filter(Objects::nonNull) // 再过滤null的scheduleId .collect(Collectors.toList()); List scheduleSteps = projectScheduleStepMapper.selectList( @@ -200,7 +200,7 @@ public class OaBonusPoolServiceImpl implements IOaBonusPoolService { scheduleSteps.stream() .filter(Objects::nonNull) // 过滤null步骤对象 .map(OaProjectScheduleStep::getHeader) - .filter(StrUtil::isNotBlank) // 过滤空昵称 + .filter(StrUtil::isNotBlank) // 过滤null/空字符串的header .forEach(allNickNames::add); // Set自动去重 }