Merge branch 'dev0410' of https://git.oschina.net/songyue123456/comm-ques-bank.git into dev0410

cqb-comm-utils/src/main/java/com/qmth/cqb/utils/word/DocxProcessUtil.java

@@ -565,9 +565,11 @@ public final class DocxProcessUtil {
                                 tmpText = tmpText.replaceFirst("\\d{1,}\\.","");
                                 text.setValue(tmpText);
                             } else if(tmpText.matches("^\\d{1,}$")){
-                                text.setValue("");
+                                tmpText = tmpText.replaceFirst("\\d{1,}","");
+                                text.setValue(tmpText);
                             } else if(tmpText.contains(".")){
-                                text.setValue("");
+                                tmpText = tmpText.replaceFirst("\\.","");
+                                text.setValue(tmpText);
                                 return p;
                             }
 
@@ -581,9 +583,11 @@ public final class DocxProcessUtil {
                                 tmpText = tmpText.replaceFirst("[A-Z]\\.","");
                                 text.setValue(tmpText);
                             } else if(tmpText.matches("^[A-Z]$")){
-                                text.setValue("");
+                                tmpText = tmpText.replaceFirst("[A-Z]","");
+                                text.setValue(tmpText);
                             } else if(tmpText.contains(".")){
-                                text.setValue("");
+                                tmpText = tmpText.replaceFirst("\\.","");
+                                text.setValue(tmpText);
                                 return p;
                             }
 

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ExtractConfigServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
 import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
 
@@ -292,6 +293,8 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 
 	@Override
 	public List<String> getExamPaperId(String courseCode,String orgId) {
+		Assert.hasLength(courseCode,"courseCode不能为空");
+		Assert.hasLength(orgId,"orgId不能为空");
 		List<String> paperIdList = new ArrayList<String>();
 		Query query = new Query();
 		query.addCriteria(Criteria.where("courseCode").is(courseCode));