Ver Fonte

重构权限系统

宋悦 há 8 anos atrás
pai
commit
7962cef0f5

+ 10 - 2
exam-work-api/src/main/java/cn/com/qmth/examcloud/service/examwork/api/ExamStudentApi.java

@@ -67,7 +67,11 @@ public class ExamStudentApi {
                                             @PathVariable Integer pageSize) {
         AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
         if(accessUser != null){
-            examStudent.setRootOrgId(accessUser.getRootOrgId());
+            if(accessUser.getRootOrgId() == accessUser.getOrgId()){
+                examStudent.setRootOrgId(accessUser.getRootOrgId());
+            }else{
+                examStudent.setOrgId(accessUser.getOrgId());
+            }
         }
         return new ResponseEntity(examStudentService.getAllExamStudent(examStudent,
                 new PageRequest(curPage, pageSize)), HttpStatus.OK);
@@ -79,7 +83,11 @@ public class ExamStudentApi {
                                             @ModelAttribute ExamStudentDTO examStudent) {
         AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
         if(accessUser != null){
-            examStudent.setRootOrgId(accessUser.getRootOrgId());
+            if(accessUser.getRootOrgId() == accessUser.getOrgId()){
+                examStudent.setRootOrgId(accessUser.getRootOrgId());
+            }else{
+                examStudent.setOrgId(accessUser.getOrgId());
+            }
         }
         return new ResponseEntity(examStudentService.getAllExamStudent(examStudent), HttpStatus.OK);
     }