Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRegistrationController.java

@@ -99,7 +99,15 @@ public class ExamRegistrationController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('examRegistration/getExamRegistrationStaticsInfo')")
     public HttpResponseResult<ExamRegistrationStatisticsDto> getExamRegistrationStaticsInfo(Integer examId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        return succeed(examRegistrationService.getExamRegistrationStaticsInfo(sysUser.getId(), examId));
+        Integer organId=null;
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.isNull(employee)){
+                return failed("用户信息异常");
+            }
+            organId=employee.getOrganId();
+        }
+        return succeed(examRegistrationService.getExamRegistrationStaticsInfo(organId, examId));
     }
 
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomController.java

@@ -147,7 +147,15 @@ public class ExamRoomController extends BaseController {
     @GetMapping(value = "/getExamRoomStatisticsInfo")
     public HttpResponseResult<ExamRoomStatisticsDto> getExamRoomStatisticsInfo(Long examId){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        return succeed(examRoomService.getExamRoomStatisticsInfo(sysUser.getId(), examId));
+        Integer organId=null;
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.isNull(employee)){
+                return failed("用户信息异常");
+            }
+            organId=employee.getOrganId();
+        }
+        return succeed(examRoomService.getExamRoomStatisticsInfo(organId, examId));
     }
 
     @ApiOperation("获取报名学员可加入教室列表")

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/StudentExamResultController.java

@@ -62,7 +62,15 @@ public class StudentExamResultController extends BaseController {
     @GetMapping(value = "/getStudentExamResultStatisticsInfo")
     public HttpResponseResult<StudentExamResultStatisticsDto> getStudentExamResultStatisticsInfo(Integer examId){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        return succeed(studentExamResultService.getStudentExamResultStatisticsInfo(sysUser.getId(), examId));
+        Integer organId=null;
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.isNull(employee)){
+                return failed("用户信息异常");
+            }
+            organId=employee.getOrganId();
+        }
+        return succeed(studentExamResultService.getStudentExamResultStatisticsInfo(organId, examId));
     }
 
 }