WANG 6 years ago
parent
commit
a7081b5dcb

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

@@ -490,6 +490,7 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 
 		List<ExamBean> list = Lists.newArrayList();
 		long next = start;
+		boolean has = false;
 		while (iterator.hasNext()) {
 			ExamEntity cur = iterator.next();
 			ExamBean bean = new ExamBean();
@@ -507,10 +508,11 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 			bean.setRootOrgId(cur.getRootOrgId());
 
 			next = cur.getId();
+			has = true;
 		}
 
 		GetExamListResp resp = new GetExamListResp();
-		if (next != start) {
+		if (has) {
 			next++;
 		}
 		resp.setNext(next);
@@ -548,6 +550,7 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 
 		List<ExamCourseRelationBean> list = Lists.newArrayList();
 		long next = start;
+		boolean has = false;
 		while (iterator.hasNext()) {
 			ExamCourseRelationEntity e = iterator.next();
 			ExamCourseRelationBean b = new ExamCourseRelationBean();
@@ -560,10 +563,11 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 
 			next = e.getCourseId();
 			list.add(b);
+			has = true;
 		}
 
 		GetExamCourseListResp resp = new GetExamCourseListResp();
-		if (next != start) {
+		if (has) {
 			next++;
 		}
 		resp.setNext(next);
@@ -600,6 +604,7 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 
 		List<ExamPaperTypeRelation> list = Lists.newArrayList();
 		long next = start;
+		boolean has = false;
 		while (iterator.hasNext()) {
 			ExamPaperTypeRelationEntity e = iterator.next();
 			ExamPaperTypeRelation b = new ExamPaperTypeRelation();
@@ -609,10 +614,11 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 
 			next = e.getCourseId();
 			list.add(b);
+			has = true;
 		}
 
 		GetExamCoursePaperTypeListResp resp = new GetExamCoursePaperTypeListResp();
-		if (next != start) {
+		if (has) {
 			next++;
 		}
 		resp.setNext(next);

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

@@ -207,6 +207,7 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
 		List<Long> examStudentIds = Lists.newArrayList();
 
 		long next = start;
+		boolean has = false;
 		while (iterator.hasNext()) {
 			ExamStudentEntity es = iterator.next();
 
@@ -251,11 +252,10 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
 			examStudentIds.add(saved.getId());
 
 			next = es.getId();
+			has = true;
 		}
 
-		if (next != start)
-
-		{
+		if (has) {
 			next++;
 		}