weiwenhai 6 lat temu
rodzic
commit
d0c8bd714a

+ 7 - 4
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigFileServiceImpl.java

@@ -113,10 +113,13 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 
     @Override
     public void saveExtractConfigAndBuildPaperFile(ExtractConfig extractConfig, Integer isbuildFile, User user) throws Exception {
-        //先查询
-    	ExtractConfig tempConfig = extractConfigService.findConfig(extractConfig);
-    	if(tempConfig != null){
-    		extractConfig = tempConfig;
+    	//新增,id为空
+    	if(StringUtils.isBlank(extractConfig.getId())){
+    		//先查询
+        	ExtractConfig tempConfig = extractConfigService.findConfig(extractConfig);
+        	if(tempConfig != null){
+        		extractConfig.setId(tempConfig.getId());
+        	}
     	}
     	//查询试卷导出设置
         ExportStructure exportStructure = null;

+ 2 - 1
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigServiceImpl.java

@@ -960,8 +960,9 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 		Query query = new Query();
 		query.addCriteria(Criteria.where("orgId").is(orgId));
 		query.addCriteria(Criteria.where("examId").is(examId));
+		query.addCriteria(Criteria.where("course.enable").is("true"));
 		if(!StringUtils.isBlank(courseCode)){
-			query.addCriteria(Criteria.where("courseCode").is(courseCode));
+			query.addCriteria(Criteria.where("course.code").is(courseCode));
 		}
 		long count = this.mongoTemplate.count(query, ExtractConfig.class);
         query.limit(pageSize);