Browse Source

试卷导出结构设置增加orgId

chenken 8 years ago
parent
commit
dcdefa2dbe

+ 10 - 0
cqb-paper/src/main/java/com/qmth/cqb/paper/model/ExportStructure.java

@@ -56,6 +56,8 @@ public class ExportStructure implements Serializable{
     private String updateUser;
 
     private Date updateTime;
+    
+    private String orgId;
 
     public ExportStructure(){}
     
@@ -160,6 +162,14 @@ public class ExportStructure implements Serializable{
 	public void setQuestionTypeNums(List<QuestionTypeNum> questionTypeNums) {
 		this.questionTypeNums = questionTypeNums;
 	}
+
+	public String getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(String orgId) {
+		this.orgId = orgId;
+	}
 	
 }
 

+ 1 - 0
cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExportStructureServiceImpl.java

@@ -69,6 +69,7 @@ public class ExportStructureServiceImpl implements ExportStructureService {
 			exportStructure.setUpdateUser(user.getName());
 			exportStructure.setUpdateTime(new Date());
 		}
+		exportStructure.setOrgId(user.getRootOrgId()+"");
 		exportStructureRepo.save(exportStructure);
 	}
 

+ 4 - 1
cqb-paper/src/main/java/com/qmth/cqb/paper/web/ExportStructureController.java

@@ -51,10 +51,13 @@ public class ExportStructureController {
 	
 	@ApiOperation(value = "分页查询导出结构", notes = "分页查询导出结构")
     @PostMapping(value = "/findPageByExportStructure/{curPage}/{pageSize}")
-	public ResponseEntity findPageByExportStructure(@PathVariable int curPage,
+	public ResponseEntity findPageByExportStructure(HttpServletRequest request,
+													@PathVariable int curPage,
 													@PathVariable int pageSize,
 													@RequestBody ExportStructure exportStructure){
 		try{
+			AccessUser user = (AccessUser) request.getAttribute("accessUser");
+			exportStructure.setOrgId(user.getRootOrgId()+"");
 			Page<ExportStructure> pageExportStructure = exportStructureService.findPageByExportStructure(exportStructure, curPage, pageSize);
 			return new ResponseEntity(pageExportStructure,HttpStatus.OK);
 		}catch(Exception e){