Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-core-basic.git

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/CourseController.java

@@ -140,7 +140,7 @@ public class CourseController extends ControllerSupport {
 		};
 
 		PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-				new Sort(Direction.DESC, "updateTime"));
+				new Sort(Direction.DESC, "updateTime", "id"));
 
 		Page<CourseEntity> page = courseRepo.findAll(specification, pageRequest);
 		return page;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/ExamSiteController.java

@@ -82,7 +82,7 @@ public class ExamSiteController extends ControllerSupport {
 		};
 
 		PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-				new Sort(Direction.DESC, "updateTime"));
+				new Sort(Direction.DESC, "updateTime", "id"));
 
 		Page<ExamSiteEntity> page = examSiteRepo.findAll(specification, pageRequest);
 		return page;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/SpecialtyController.java

@@ -133,7 +133,7 @@ public class SpecialtyController extends ControllerSupport {
 		};
 
 		PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-				new Sort(Direction.DESC, "updateTime"));
+				new Sort(Direction.DESC, "updateTime", "id"));
 
 		Page<SpecialtyEntity> page = specialtyRepo.findAll(specification, pageRequest);
 		return page;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/StudentController.java

@@ -179,7 +179,7 @@ public class StudentController extends ControllerSupport {
 		};
 
 		PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-				new Sort(Direction.DESC, "updateTime"));
+				new Sort(Direction.DESC, "updateTime", "id"));
 
 		Page<StudentEntity> studentList = studentRepo.findAll(specification, pageRequest);
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/SystemPropertyController.java

@@ -91,7 +91,7 @@ public class SystemPropertyController extends ControllerSupport {
 		};
 
 		PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-				new Sort(Direction.DESC, "updateTime"));
+				new Sort(Direction.DESC, "updateTime", "propKey"));
 
 		Page<SystemPropertyEntity> page = systemPropertyRepo.findAll(specification, pageRequest);
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/UserController.java

@@ -167,8 +167,8 @@ public class UserController extends ControllerSupport {
 			}
 			return cb.and(predicates.toArray(new Predicate[predicates.size()]));
 		};
-		Pageable pageable = PageRequest.of(curPage - 1, pageSize, Sort.Direction.DESC,
-				"updateTime");
+		Pageable pageable = PageRequest.of(curPage - 1, pageSize, Sort.Direction.DESC, "updateTime",
+				"id");
 
 		Page<UserEntity> userList = userRepo.findAll(specification, pageable);