查询课程增加默认orgId

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

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import cn.com.qmth.examcloud.common.util.excel.ExcelError;
 import cn.com.qmth.examcloud.service.core.assemble.CourseAssembler;
 import cn.com.qmth.examcloud.service.core.dto.CourseDTO;
@@ -50,13 +52,24 @@ public class CourseApi {
 
     @ApiOperation(value="查询课程分页带查询",notes="分页带查询")
     @GetMapping("/all/{curPage}/{pageSize}")
-    public ResponseEntity getAllOrg(@ModelAttribute Course course, @PathVariable Integer curPage,@PathVariable Integer pageSize){
-        return new ResponseEntity(courseService.findAlL(course,new PageRequest(curPage - 1,pageSize)), HttpStatus.OK);
+    public ResponseEntity getAllOrg(@ModelAttribute Course course, 
+    		@PathVariable Integer curPage,
+    		@PathVariable Integer pageSize,
+    		HttpServletRequest request){
+    	if(null == course.getOrgId()){
+    		AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+    		course.setOrgId(accessUser.getRootOrgId());
+    	}
+    	return new ResponseEntity(courseService.findAlL(course,new PageRequest(curPage - 1,pageSize)), HttpStatus.OK);
     }
     
     @ApiOperation(value="查询课程不分页带查询",notes = "不分页带查询")
     @GetMapping("/all")
-    public ResponseEntity getAllExam(@ModelAttribute Course course){
+    public ResponseEntity getAllExam(@ModelAttribute Course course,HttpServletRequest request){
+    	if(null == course.getOrgId()){
+    		AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+    		course.setOrgId(accessUser.getRootOrgId());
+    	}
         return new ResponseEntity(courseService.findAlL(course), HttpStatus.OK);
     }
     

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

@@ -74,6 +74,7 @@ public class OrgApi {
     @ApiOperation(value="新增机构",notes="新增")
     @PostMapping
     public ResponseEntity addSchool(@RequestBody Org org){
+    	org.setCreateTime(new Date());
         return new ResponseEntity(orgRepo.save(org),HttpStatus.CREATED);
     }
 

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

@@ -52,7 +52,6 @@ public class Org implements Serializable{
     /**
      * 可使用的应用模块
      */
-    @NotNull
     private String apps;
 
     @NotNull