试题分布bug

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportPaperServiceImpl.java

@@ -653,18 +653,18 @@ public class ExportPaperServiceImpl implements ExportPaperService{
 		for(Question question:quesList){
 			if(question.getPublicity()){
 				//公开
-				if(question.getDifficulty().equals("难")){
+				if(question.getDifficulty() !=null && question.getDifficulty().equals("难") || question.getDifficultyDegree()<0.4 && question.getDifficultyDegree()>0){
 					map = buildMapSum(questionType*100+1,map);
-				}else if(question.getDifficulty().equals("中")) {
+				}else if(question.getDifficulty() !=null && question.getDifficulty().equals("中") || question.getDifficultyDegree()<0.8 && question.getDifficultyDegree()>0.3) {
 					map = buildMapSum(questionType*100+2,map);
 				}else{
 					map = buildMapSum(questionType*100+3,map);
 				}
 			}else {
 				//非公开
-				if(question.getDifficulty().equals("难")){
+				if(question.getDifficulty() !=null && question.getDifficulty().equals("难") || question.getDifficultyDegree()<0.4 && question.getDifficultyDegree()>0){
 					map = buildMapSum(questionType*100+11,map);
-				}else if(question.getDifficulty().equals("中")){
+				}else if(question.getDifficulty() !=null && question.getDifficulty().equals("中") || question.getDifficultyDegree()<0.8 && question.getDifficultyDegree()>0.3){
 					map = buildMapSum(questionType*100+12,map);
 				}else{
 					map = buildMapSum(questionType*100+13,map);