增加-非空判断

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -1563,6 +1563,11 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
         //团队经纪人个数
         //团队经纪人个数
         BigDecimal practitionerNum = BigDecimal.valueOf(aclPractitioners.size());
         BigDecimal practitionerNum = BigDecimal.valueOf(aclPractitioners.size());
         List<Long> practitionerIds = new ArrayList<>();
         List<Long> practitionerIds = new ArrayList<>();
+        if (practitionerIds.isEmpty()){
+            responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+            return responseVO;
+        }
+
         for (AclPractitioner info : aclPractitioners){
         for (AclPractitioner info : aclPractitioners){
             practitionerIds.add(info.getId());
             practitionerIds.add(info.getId());
         }
         }
@@ -1598,15 +1603,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
         responseVO.setScoreWeekAverage(scoreWeekAverage);
         responseVO.setScoreWeekAverage(scoreWeekAverage);
         responseVO.setScoreMonthAverage(scoreMonthAverage);
         responseVO.setScoreMonthAverage(scoreMonthAverage);
         responseVO.setOpportunitiesNum(opportunitiesNum);
         responseVO.setOpportunitiesNum(opportunitiesNum);
-        responseVO.setPremiumMonth(performanceForecast.get("totalFYPMonth").doubleValue());
-        responseVO.setCommissionMonth(performanceForecast.get("totalFYCMonth").doubleValue());
-        responseVO.setPiecesMonth(performanceForecast.get("totalPiecesMonth").doubleValue());
-        responseVO.setPremiumQuarter(performanceForecast.get("totalFYPQuarter").doubleValue());
-        responseVO.setCommissionQuarter(performanceForecast.get("totalFYCQuarter").doubleValue());
-        responseVO.setPiecesQuarter(performanceForecast.get("totalPiecesQuarter").doubleValue());
-        responseVO.setPremiumYear(performanceForecast.get("totalFYPYear").doubleValue());
-        responseVO.setCommissionYear(performanceForecast.get("totalFYCYear").doubleValue());
-        responseVO.setPiecesYear(performanceForecast.get("totalPiecesYear").doubleValue());
+        responseVO.setPremiumMonth(CommonUtil.isNullOrZero(performanceForecast.get("totalFYPMonth"))?0:performanceForecast.get("totalFYPMonth").doubleValue());
+        responseVO.setCommissionMonth(CommonUtil.isNullOrZero(performanceForecast.get("totalFYCMonth"))?0:performanceForecast.get("totalFYCMonth").doubleValue());
+        responseVO.setPiecesMonth(CommonUtil.isNullOrZero(performanceForecast.get("totalPiecesMonth"))?0:performanceForecast.get("totalPiecesMonth").doubleValue());
+        responseVO.setPremiumQuarter(CommonUtil.isNullOrZero(performanceForecast.get("totalFYPQuarter"))?0:performanceForecast.get("totalFYPQuarter").doubleValue());
+        responseVO.setCommissionQuarter(CommonUtil.isNullOrZero(performanceForecast.get("totalFYCQuarter"))?0:performanceForecast.get("totalFYCQuarter").doubleValue());
+        responseVO.setPiecesQuarter(CommonUtil.isNullOrZero(performanceForecast.get("totalPiecesQuarter"))?0:performanceForecast.get("totalPiecesQuarter").doubleValue());
+        responseVO.setPremiumYear(CommonUtil.isNullOrZero(performanceForecast.get("totalFYPYear"))?0:performanceForecast.get("totalFYPYear").doubleValue());
+        responseVO.setCommissionYear(CommonUtil.isNullOrZero(performanceForecast.get("totalFYCYear"))?0:performanceForecast.get("totalFYCYear").doubleValue());
+        responseVO.setPiecesYear(CommonUtil.isNullOrZero(performanceForecast.get("totalPiecesYear"))?0:performanceForecast.get("totalPiecesYear").doubleValue());
         responseVO.setAchievementRateYear(achievementRateMap.get("achievementRateYear"));
         responseVO.setAchievementRateYear(achievementRateMap.get("achievementRateYear"));
         responseVO.setAchievementRateQuarter(achievementRateMap.get("achievementRateQuarter"));
         responseVO.setAchievementRateQuarter(achievementRateMap.get("achievementRateQuarter"));
         responseVO.setAchievementRateMonth(achievementRateMap.get("achievementRateMonth"));
         responseVO.setAchievementRateMonth(achievementRateMap.get("achievementRateMonth"));