添加指标考核结果排名判空逻辑

src/main/java/com/keymobile/indicators/service/report/IndicatorsReportService.java

@@ -295,34 +295,38 @@ public class IndicatorsReportService {
 		Map<String,String> valueMap = new HashMap<>();
 		//前三
 		for(DriveIndCalResultDef calResult : calResults) {
-			valueMap.put(calResult.getCompareObj(), calResult.getValue());
-			if(calResult.getRank()==1 || calResult.getRank()==2 || calResult.getRank()==3) {
-				if(calResult.getCompareObj().equals(indReportData.getCompareObj())) {
-					if(indReportData.getRankHeadThreeIndCount()==null) {
-						indReportData.setRankHeadThreeIndCount(1);
-					}else {
-						indReportData.setRankHeadThreeIndCount(
-								indReportData.getRankHeadThreeIndCount()+1);
+			if(calResult.getRank()!=null) {
+				valueMap.put(calResult.getCompareObj(), calResult.getValue());
+				if(calResult.getRank()==1 || calResult.getRank()==2 || calResult.getRank()==3) {
+					if(calResult.getCompareObj().equals(indReportData.getCompareObj())) {
+						if(indReportData.getRankHeadThreeIndCount()==null) {
+							indReportData.setRankHeadThreeIndCount(1);
+						}else {
+							indReportData.setRankHeadThreeIndCount(
+									indReportData.getRankHeadThreeIndCount()+1);
+						}
 					}
 				}
 			}
 		}
-		//末三
-		Map<String,Integer> rankValue = new HashMap<>();
-		if("0".equals(indRule)) {//正向
-			rankValue = CalculateUtils.rankValue(valueMap, "1");
-		}else {//反向
-			rankValue = CalculateUtils.rankValue(valueMap, "0");
-		}
-		if(!rankValue.isEmpty()) {
-			for(Map.Entry<String, Integer> map : rankValue.entrySet()) {
-				if(map.getValue()==1 || map.getValue()==2 || map.getValue()==3) {
-					if(map.getKey().equals(indReportData.getCompareObj())) {
-						if(indReportData.getRankAfterThreeIndCount()==null) {
-							indReportData.setRankAfterThreeIndCount(1);
-						}else {
-							indReportData.setRankAfterThreeIndCount(
-									indReportData.getRankAfterThreeIndCount()+1);
+		if(!valueMap.isEmpty()) {
+			//末三
+			Map<String,Integer> rankValue = new HashMap<>();
+			if("0".equals(indRule)) {//正向
+				rankValue = CalculateUtils.rankValue(valueMap, "1");
+			}else {//反向
+				rankValue = CalculateUtils.rankValue(valueMap, "0");
+			}
+			if(!rankValue.isEmpty()) {
+				for(Map.Entry<String, Integer> map : rankValue.entrySet()) {
+					if(map.getValue()==1 || map.getValue()==2 || map.getValue()==3) {
+						if(map.getKey().equals(indReportData.getCompareObj())) {
+							if(indReportData.getRankAfterThreeIndCount()==null) {
+								indReportData.setRankAfterThreeIndCount(1);
+							}else {
+								indReportData.setRankAfterThreeIndCount(
+										indReportData.getRankAfterThreeIndCount()+1);
+							}
 						}
 					}
 				}