套题修改

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

@@ -711,9 +711,17 @@ public class ImportPaperService {
         }
         if(StringUtils.isEmpty(quesBodyHtml) || StringUtils.isEmpty(quesBodyWordMl)){
             if(subQuesNum == 0){
-                importPaperCheck.setErrorInfo(importPaperCheck.quesName+ImportPaperMsg.errMsg_01);
+            	if(importPaperCheck.nestedHeadNumber!= 0){
+        			importPaperCheck.setErrorInfo(importPaperCheck.quesName+"第"+importPaperCheck.nestedHeadNumber+"个题"+ImportPaperMsg.errMsg_01);
+        		}else {
+        			importPaperCheck.setErrorInfo(getQuesNumInfo(importPaperCheck.quesName, subQuesNum)+ImportPaperMsg.errMsg_01);
+    			}
             }else{
-                importPaperCheck.setErrorInfo(getQuesNumInfo(importPaperCheck.quesName,subQuesNum)+ImportPaperMsg.errMsg_01);
+            	if(importPaperCheck.nestedHeadNumber!= 0){
+        			importPaperCheck.setErrorInfo(importPaperCheck.quesName+"第"+importPaperCheck.nestedHeadNumber+"个题"+subQuesNum+ImportPaperMsg.errMsg_01);
+        		}else {
+        			importPaperCheck.setErrorInfo(getQuesNumInfo(importPaperCheck.quesName, subQuesNum)+ImportPaperMsg.errMsg_01);
+    			}
             }
             throw new PaperException(importPaperCheck.errorInfo);
         }
@@ -1214,8 +1222,8 @@ public class ImportPaperService {
 					}
                 	throw new PaperException(importPaperCheck.errorInfo);
                 }
-                if (StringUtils.isEmpty(nestedQuesType)) {
-                    importPaperCheck.setErrorInfo(getQuesNumInfo(importPaperCheck.quesName, subQuesNum) + ImportPaperMsg.errMsg_02);
+                if (StringUtils.isBlank(nestedQuesType) || getQuesStructType(nestedQuesType) == null) {
+                    importPaperCheck.setErrorInfo(importPaperCheck.quesName+"第"+importPaperCheck.nestedHeadNumber+"个题"+subQuesNum+"中,"+ ImportPaperMsg.errMsg_02);
                     throw new PaperException(importPaperCheck.errorInfo);
                 }
                 subQues = new Question();