fix:NullPointException
This commit is contained in:
parent
d78267f219
commit
fb4b563aee
|
@ -2,6 +2,7 @@ package org.jeecg.modules.system.service.impl;
|
||||||
|
|
||||||
import cn.hutool.core.collection.CollUtil;
|
import cn.hutool.core.collection.CollUtil;
|
||||||
import cn.hutool.core.map.MapUtil;
|
import cn.hutool.core.map.MapUtil;
|
||||||
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
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.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
|
@ -26,8 +28,10 @@ public class GardsNuclLibServiceImpl extends ServiceImpl<GardsNuclLibMapper, Gar
|
||||||
Map<String, Double> halfLife = MapUtil.newHashMap();
|
Map<String, Double> halfLife = MapUtil.newHashMap();
|
||||||
if (CollUtil.isEmpty(nuclideNames))
|
if (CollUtil.isEmpty(nuclideNames))
|
||||||
return halfLife;
|
return halfLife;
|
||||||
halfLife = baseMapper.halfLife(nuclideNames).stream().collect(Collectors
|
halfLife = baseMapper.halfLife(nuclideNames).stream()
|
||||||
.toMap(GardsNuclLibDto::getName, GardsNuclLibDto::getHalflife));
|
.filter(obj -> StrUtil.isNotBlank(obj.getName()))
|
||||||
|
.filter(obj -> ObjectUtil.isNotNull(obj.getHalflife()))
|
||||||
|
.collect(Collectors.toMap(GardsNuclLibDto::getName, GardsNuclLibDto::getHalflife));
|
||||||
return halfLife;
|
return halfLife;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user