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自动去重 }