1.修改空指针

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java

@@ -295,8 +295,7 @@ public class View3dServiceImpl implements IView3dService {
         }
         Optional<RiskSource> optional = iRiskSourceDao.findByOrgCodeAndParentId(orgCode,0L);
         TodaySafetyIndexVo vo = new TodaySafetyIndexVo();
-        if(optional.isPresent()){
-            //1.按照等级进行转换rpn为分数-机构
+        if(optional.isPresent()){               //1.按照等级进行转换rpn为分数-机构
             RiskSource riskSource = optional.get();
             double safetyIndex = this.changeRpnToSafetyIndex(riskSource.getRpn());
             vo.setSafetyIndex(safetyIndex);
@@ -420,7 +419,8 @@ public class View3dServiceImpl implements IView3dService {
             List<RiskSource> regionList = iRiskSourceDao.findByParentIdAndIsRegion(optional.get().getId(),RiskSourceRegionEum.TRUE.getCode());
             exceptionList = regionList.stream().filter(riskSource -> {
                 BigDecimal rpn = riskSource.getRpn() == null ? new  BigDecimal("0") : riskSource.getRpn();
-                return rpn.subtract(riskSource.getRpni()).doubleValue() > 0;
+                BigDecimal rpni = riskSource.getRpni() == null ? new  BigDecimal("0") : riskSource.getRpni();
+                return rpn.subtract(rpni).doubleValue() > 0;
             }).map(riskSource -> {
                 ExceptionRegionVo regionVo = new ExceptionRegionVo();
                 regionVo.setId(riskSource.getId());