fix

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

@@ -1,8 +1,12 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
+import java.util.List;
+
 public interface RandomPaperQuestionService {
 
 	boolean existQuestion(String questionId);
 
+	boolean existQuestion(List<String> questionIds);
+
 
 }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/bean/randompaper/RandomPaperQuery.java

@@ -14,6 +14,9 @@ public class RandomPaperQuery extends PagerQuery {
 
 	@ApiModelProperty("状态")
 	private Boolean enable;
+	
+	@ApiModelProperty("ID")
+	private String id;
 
 	@ApiModelProperty(hidden = true)
 	private Long rootOrgId;
@@ -61,4 +64,12 @@ public class RandomPaperQuery extends PagerQuery {
 		this.ud = ud;
 	}
 
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
 }

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

@@ -131,6 +131,7 @@ import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 public class PaperServiceImpl implements PaperService {
 
 	private static final Logger LOG = LoggerFactory.getLogger(PaperServiceImpl.class);
+	
 	@Autowired
 	private PropertyRepo propertyRepo;
 	@Autowired
@@ -590,6 +591,10 @@ public class PaperServiceImpl implements PaperService {
 			List<Question> quesList = new ArrayList<>();
 			for (Paper paper : papers) {
 				List<PaperDetailUnit> paperUnits = paperDetailUnitRepo.findByPaperOrderByNumber(paper);
+				List<String> questionIds=paperUnits.stream().map(e->e.getQuestion().getId()).collect(Collectors.toList());
+				if(randomPaperQuestionService.existQuestion(questionIds)) {
+					throw new StatusException("试卷[" + paper.getName() + "]中有试题被抽题模板使用，不能删除");
+				}
 				for (PaperDetailUnit pdu : paperUnits) {
 					if (pdu.getQuestion() != null) {
 						quesList.add(pdu.getQuestion());

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

@@ -1,5 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -13,6 +15,7 @@ import cn.com.qmth.examcloud.core.questions.service.RandomPaperQuestionService;
 public class RandomPaperQuestionServiceImpl implements RandomPaperQuestionService {
 	@Autowired
 	private MongoTemplate mongoTemplate;
+	
 	@Override
 	public boolean existQuestion(String questionId) {
 		Query query = new Query();
@@ -21,5 +24,12 @@ public class RandomPaperQuestionServiceImpl implements RandomPaperQuestionServic
 		return rp!=null;
 	}
 	
+	@Override
+	public boolean existQuestion(List<String> questionIds) {
+		Query query = new Query();
+		query.addCriteria(Criteria.where("questionId").in(questionIds));
+		long count=mongoTemplate.count(query,RandomPaperQuestion.class);
+		return count>0;
+	}
 
 }

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

@@ -95,25 +95,33 @@ public class RandomPaperServiceImpl implements RandomPaperService {
 		if (req.getUd().assertEmptyQueryResult()) {
 			return Page.empty();
 		}
-		Query query = new Query();
-
-		query.addCriteria(Criteria.where("rootOrgId").is(req.getRootOrgId()));
+		Query query;
+		List<Criteria> cs=new ArrayList<>();
+		cs.add(Criteria.where("rootOrgId").is(req.getRootOrgId()));
 
 		if (req.getUd().assertNeedQueryRefIds()) {
-			query.addCriteria(Criteria.where("courseId").in(req.getUd().getRefIds()));
+			cs.add(Criteria.where("courseId").in(req.getUd().getRefIds()));
 		}
 
 		if (req.getEnable() != null) {
-			query.addCriteria(Criteria.where("enable").is(req.getEnable()));
+			cs.add(Criteria.where("enable").is(req.getEnable()));
 		}
 
 		if (req.getCourseId() != null) {
-			query.addCriteria(Criteria.where("courseId").is(req.getCourseId()));
+			cs.add(Criteria.where("courseId").is(req.getCourseId()));
 		}
-
-		if (StringUtils.isNoneBlank(req.getName())) {
+		if (StringUtils.isNotBlank(req.getName())) {
 			String paperName = CommonUtils.escapeExprSpecialWord(req.getName());
-			query.addCriteria(Criteria.where("name").regex(".*?\\.*" + paperName + ".*"));
+			cs.add(Criteria.where("name").regex(".*?\\.*" + paperName + ".*"));
+		}
+		Criteria and=new Criteria();
+		Criteria[] cas=new Criteria[cs.size()];
+		if (StringUtils.isNotBlank(req.getId())) {
+			and.andOperator(cs.toArray(cas));
+			query=Query.query(new Criteria().orOperator(and,Criteria.where("id").is(req.getId())));
+		}else {
+			and.andOperator(cs.toArray(cas));
+			query=Query.query(and);
 		}
 
 		long total = this.mongoTemplate.count(query, RandomPaper.class);