...

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

@@ -10,6 +10,7 @@ import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -51,22 +52,21 @@ public class StudentController extends ControllerSupport{
     @Autowired
     UserRepo userRepo;
 
-    @ApiOperation(value="查询所有学生",notes="分页")
-    @GetMapping("/{curPage}/{pageSize}")
-    public ResponseEntity getAllStudent(HttpServletRequest request,
-                                        @ModelAttribute Student studentCriteria,
-                                        @PathVariable Integer curPage,
-                                        @PathVariable Integer pageSize){
-        cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
-        if(accessUser != null){
-            if(accessUser.getRootOrgId().longValue() == accessUser.getOrgId().longValue()){
-                studentCriteria.setRootOrgId(accessUser.getRootOrgId());
-            }else{
-                studentCriteria.setOrgId(accessUser.getOrgId());
-            }
-        }
-        return new ResponseEntity(studentService.getAllStudent(studentCriteria,new PageRequest(curPage,pageSize)),HttpStatus.OK);
-    }
+	@ApiOperation(value = "查询所有学生", notes = "分页")
+	@GetMapping("/{curPage}/{pageSize}")
+	public Page<Student> getAllStudent(HttpServletRequest request,
+			@ModelAttribute Student studentCriteria, @PathVariable Integer curPage,
+			@PathVariable Integer pageSize) {
+		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
+
+		if (!isSuperAdmin()) {
+			studentCriteria.setRootOrgId(accessUser.getRootOrgId());
+		}
+
+		Page<Student> studentList = studentService.getAllStudent(studentCriteria,
+				new PageRequest(curPage, pageSize));
+		return studentList;
+	}
 
     @ApiOperation(value="查询所有学生",notes="不分页")
     @GetMapping

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Student.java

@@ -1,19 +1,28 @@
 package cn.com.qmth.examcloud.core.basic.dao.entity;
 
-import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
 
-import java.io.Serializable;
-import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
 
 /**
  * Created by songyue on 17/1/13.
  */
 @Entity
 @Table(name = "ecs_core_student")
-public class Student implements Serializable {
+public class Student implements JsonSerializable {
 
 	private static final long serialVersionUID = 757531976286006550L;