wangwei 5 years ago
parent
commit
e44183655b

+ 0 - 5
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/OnGoingExamServiceImpl.java

@@ -6,7 +6,6 @@ import java.util.List;
 
 import javax.persistence.criteria.Predicate;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -66,10 +65,6 @@ public class OnGoingExamServiceImpl implements OnGoingExamService {
 		List<ExamSpecialSettingsEntity> byOrg = getByOrg(rootOrgId, et, orgId);
 		List<ExamSpecialSettingsEntity> byStudentId = getByStudentId(rootOrgId, et, studentId);
 
-		if (CollectionUtils.isNotEmpty(byOrg) && CollectionUtils.isNotEmpty(byStudentId)) {
-			throw new StatusException("008005", "data error");
-		}
-
 		List<ExamSpecialSettingsEntity> examList = Lists.newArrayListWithCapacity(0);
 		examList.addAll(byOrg);
 		examList.addAll(byStudentId);