Merge remote-tracking branch 'origin/dev1130' into dev1130

cqb-gen-paper/src/main/java/com/qmth/cqb/genpaper/service/GenPaperService.java

@@ -14,6 +14,7 @@ import java.util.UUID;
 
 import com.qmth.cqb.utils.enums.PaperStructType;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -595,9 +596,14 @@ public class GenPaperService {
     		for(QuesProperty quesProperty:quesProperties){
     			if(quesProperty.getSecondProperty() != null){
     				//有一级  和  二级
-    				propertyGroup = String.valueOf(quesProperty.getFirstProperty().getId()) + "-" +
-								    String.valueOf(quesProperty.getSecondProperty().getId()) + "-" +
-								    String.valueOf(question.getPublicity()) + "-" + question.getDifficulty();
+    				if(quesProperty.getSecondProperty().getId() == null || StringUtils.isBlank(String.valueOf(quesProperty.getSecondProperty().getId()))){
+    					propertyGroup = String.valueOf(quesProperty.getFirstProperty().getId()) + "-" +
+							    String.valueOf(question.getPublicity()) + "-" + question.getDifficulty();
+    				}else {
+    					propertyGroup = String.valueOf(quesProperty.getFirstProperty().getId()) + "-" +
+							    String.valueOf(quesProperty.getSecondProperty().getId()) + "-" +
+							    String.valueOf(question.getPublicity()) + "-" + question.getDifficulty();
+					}
     				propertyGroups.add(propertyGroup);
     			}else {
     				//有一级  无  二级