提交题库代码bug

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PaperController.java

@@ -588,9 +588,10 @@ public class PaperController extends ControllerSupport {
     }
 
     @ApiOperation(value = "预览试卷页面")
-    @GetMapping(value = "/paper/pdf/{paperId}/{orgName}")
-    public String viewPaper(Model model, @PathVariable String paperId, @PathVariable String orgName) {
-    	ExportServiceManage esm = exportServiceManageRepo.findByOrgName(orgName);
+    @GetMapping(value = "/paper/pdf/{paperId}")
+    public String viewPaper(Model model, @PathVariable String paperId) {
+    	Paper paperBase = paperRepo.findOne(paperId);
+    	ExportServiceManage esm = exportServiceManageRepo.findByOrgId(paperBase.getOrgId());
     	if (esm == null) {
             esm = exportServiceManageRepo.findByOrgName("山东大学");
         }
@@ -605,9 +606,10 @@ public class PaperController extends ControllerSupport {
     }
 
     @ApiOperation(value = "预览试卷答案页面")
-    @GetMapping(value = "/paper/answer/pdf/{paperId}/{orgName}")
-    public String viewPaperAnswer(Model model, @PathVariable String paperId, @PathVariable String orgName) {
-    	ExportServiceManage esm = exportServiceManageRepo.findByOrgName(orgName);
+    @GetMapping(value = "/paper/answer/pdf/{paperId}")
+    public String viewPaperAnswer(Model model, @PathVariable String paperId) {
+    	Paper paperBase = paperRepo.findOne(paperId);
+    	ExportServiceManage esm = exportServiceManageRepo.findByOrgId(paperBase.getOrgId());
     	if (esm == null) {
             esm = exportServiceManageRepo.findByOrgName("山东大学");
         }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExportServiceManageRepo.java

@@ -7,4 +7,6 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExportServiceManage;
 
 public interface ExportServiceManageRepo extends MongoRepository<ExportServiceManage, Long>,QueryByExampleExecutor<ExportServiceManage> {
 	ExportServiceManage findByOrgName(String orgName);
+	
+	ExportServiceManage findByOrgId(String orgId);
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExportServiceManage.java

@@ -10,6 +10,8 @@ public class ExportServiceManage  implements Serializable {
 
 	@Id
 	private String id;
+	
+	private String orgId;
 	 
 	private String orgName;
 	 
@@ -38,6 +40,13 @@ public class ExportServiceManage  implements Serializable {
 	public void setExportServiceName(String exportServiceName) {
 		this.exportServiceName = exportServiceName;
 	}
+
+	public String getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(String orgId) {
+		this.orgId = orgId;
+	}
 	  
-	 
 }

examcloud-core-questions-starter/src/main/resources/security-exclusions.conf

@@ -20,5 +20,5 @@ regexp:.*webjars.*
 [${api_cqb}/][/extract/getAnswerHtml/{paperId}][GET]
 [${api_cqb}/][/extract/paper/{paperId}][GET]
 [${api_cqb}/][/checkObjective/{paperId}][GET]
-[${api_cqb}/][/paper/pdf/{paperId}/{orgName}][GET]
-[${api_cqb}/][/paper/answer/pdf/{paperId}/{orgName}][GET]
+[${api_cqb}/][/paper/pdf/{paperId}][GET]
+[${api_cqb}/][/paper/answer/pdf/{paperId}][GET]