WANG 6 vuotta sitten
vanhempi
commit
60b6c24f69

+ 9 - 3
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamCloudServiceProvider.java

@@ -172,7 +172,8 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 
 		Long orgId = req.getOrgId();
 		if (null != orgId) {
-			ExamOrgSettingsEntity examOrgEntity = examOrgSettingsRepo.findByExamIdAndOrgId(exam.getId(), orgId);
+			ExamOrgSettingsEntity examOrgEntity = examOrgSettingsRepo
+					.findByExamIdAndOrgId(exam.getId(), orgId);
 
 			bean.setBeginTime(examOrgEntity.getBeginTime());
 			bean.setEndTime(examOrgEntity.getEndTime());
@@ -373,7 +374,11 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 				predicates.add(cb.equal(root.get("enable"), enable));
 			}
 			if (CollectionUtils.isNotEmpty(examTypes)) {
-				predicates.add(root.get("examType").in(examTypes));
+				if (1 == examTypeList.size()) {
+					predicates.add(cb.equal(root.get("examType"), examTypes.get(0)));
+				} else {
+					predicates.add(root.get("examType").in(examTypes));
+				}
 			}
 
 			return cb.and(predicates.toArray(new Predicate[predicates.size()]));
@@ -432,7 +437,8 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 			return cb.and(predicates.toArray(new Predicate[predicates.size()]));
 		};
 
-		Page<ExamCourseRelationEntity> page = examCourseRelationRepo.findAll(specification, pageable);
+		Page<ExamCourseRelationEntity> page = examCourseRelationRepo.findAll(specification,
+				pageable);
 
 		Iterator<ExamCourseRelationEntity> iterator = page.iterator();