学生增加orgId

core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/StudentApi.java

@@ -1,5 +1,7 @@
 package cn.com.qmth.examcloud.service.core.api;
 
+import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
+import cn.com.qmth.examcloud.service.core.entity.User;
 import io.swagger.annotations.ApiOperation;
 
 import java.io.File;
@@ -28,6 +30,8 @@ import cn.com.qmth.examcloud.service.core.enums.LoginType;
 import cn.com.qmth.examcloud.service.core.repo.StudentRepo;
 import cn.com.qmth.examcloud.service.core.service.StudentService;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 学生服务API
  * Created by songyue on 17/1/14.
@@ -44,13 +48,25 @@ public class StudentApi {
 
     @ApiOperation(value="查询所有学生",notes="分页")
     @GetMapping("/{curPage}/{pageSize}")
-    public ResponseEntity getAllStudent(@ModelAttribute Student studentCriteria, @PathVariable Integer curPage, @PathVariable Integer pageSize){
+    public ResponseEntity getAllStudent(HttpServletRequest request,
+                                        @ModelAttribute Student studentCriteria,
+                                        @PathVariable Integer curPage,
+                                        @PathVariable Integer pageSize){
+        AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+        if(accessUser != null){
+            studentCriteria.setOrgId(accessUser.getRootOrgId());
+        }
         return new ResponseEntity(studentService.getAllStudent(studentCriteria,new PageRequest(curPage,pageSize)),HttpStatus.OK);
     }
 
     @ApiOperation(value="查询所有学生",notes="不分页")
     @GetMapping
-    public ResponseEntity getAllStudent(@ModelAttribute Student studentCriteria){
+    public ResponseEntity getAllStudent(HttpServletRequest request,
+                                        @ModelAttribute Student studentCriteria){
+        AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+        if(accessUser != null){
+            studentCriteria.setOrgId(accessUser.getRootOrgId());
+        }
         return new ResponseEntity(studentService.getAllStudent(studentCriteria),HttpStatus.OK);
     }
 

core-api/src/main/java/cn/com/qmth/examcloud/service/core/service/StudentService.java

@@ -121,6 +121,7 @@ public class StudentService {
                 entity.setUpdateTime(new Date());
                 return studentRepo.save(entity);
             }
+            student.setOrgId(student.getUser().getRootOrgId());
             //新建用户和学生
             User user = new User(student.getName(), UserScope.ORG, student.getUser().getRootOrgId(), student.getUser().getOrgId(), UserType.STUDENT);
             user.setEnable(student.getUser().getEnable() == null ? true : student.getUser().getEnable());

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/Student.java

@@ -46,6 +46,8 @@ public class Student implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 
+	private Long orgId;
+
 	public static long getSerialVersionUID() {
 		return serialVersionUID;
 	}
@@ -130,6 +132,14 @@ public class Student implements Serializable {
 		this.enable = enable;
 	}
 
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
 	public Student() {
 	}
 }