From fb4b563aee60fef81f88d3dc049c02dcf73bc818 Mon Sep 17 00:00:00 2001 From: nieziyan Date: Tue, 5 Sep 2023 16:23:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9ANullPointException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/GardsNuclLibServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclLibServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclLibServiceImpl.java index ebe158d5..e4a9ee82 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclLibServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclLibServiceImpl.java @@ -2,6 +2,7 @@ package org.jeecg.modules.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -15,6 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @Service @@ -26,8 +28,10 @@ public class GardsNuclLibServiceImpl extends ServiceImpl halfLife = MapUtil.newHashMap(); if (CollUtil.isEmpty(nuclideNames)) return halfLife; - halfLife = baseMapper.halfLife(nuclideNames).stream().collect(Collectors - .toMap(GardsNuclLibDto::getName, GardsNuclLibDto::getHalflife)); + halfLife = baseMapper.halfLife(nuclideNames).stream() + .filter(obj -> StrUtil.isNotBlank(obj.getName())) + .filter(obj -> ObjectUtil.isNotNull(obj.getHalflife())) + .collect(Collectors.toMap(GardsNuclLibDto::getName, GardsNuclLibDto::getHalflife)); return halfLife; }