Merge remote-tracking branch 'origin/fix_bug_2024-02-03' into dev

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -1196,7 +1196,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		questContrastVO.setQuestTarget(3);
 		List<QuestDetailEntity> list2 = baseMapper.selectQuestDetailList(questDetailDTO.getQuestNum(), questContrastVO);
 		if (ObjectUtils.isNotNull(list2)) {
-			list2.stream().collect(Collectors.groupingBy(QuestDetailEntity::getStockId)).forEach((k, v) -> {
+			list2.stream().filter(item -> !Objects.isNull(item.getStockId())).collect(Collectors.groupingBy(QuestDetailEntity::getStockId)).forEach((k, v) -> {
 				DistributionStockListEntity stockListBy = distributionStockListClient.getStockListById(k);
 				if (ObjectUtils.isNull(stockListBy)) {
 					return;