Merge branch 'dev'

1

themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateController.java

@@ -405,7 +405,7 @@ public class TIeInvigilateController {
     @ApiOperation(value = "进度查询列表接口")
     @RequestMapping(value = "/progress/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "监考进度信息", response = InvigilateListProgressBean.class)})
-    public Result progressList(@ApiParam(value = "考试批次id", required = true) @RequestParam(required = true) Long examId,
+    public Result progressList(@ApiParam(value = "考试批次id", required = true) @RequestParam(required = false) Long examId,
                                @ApiParam(value = "考试场次id", required = false) @RequestParam(required = false) Long examActivityId,
                                @ApiParam(value = "虚拟考场代码", required = false) @RequestParam(required = false) String roomCode,
                                @ApiParam(value = "科目代码", required = false) @RequestParam(required = false) String courseCode,
@@ -414,16 +414,17 @@ public class TIeInvigilateController {
                                @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                                @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {
-            throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
-        }
-        TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
-        AuthDto authDto = (AuthDto) redisUtil.get(SystemConstant.userOauth + "::" + tbUser.getId());
-        //如果有监考员角色，只能查看自己所监考的考场，巡考员和管理员则可以查看全部考场
-        Long userId = null;
-        if (authDto.getRoleCodes().toString().contains(RoleEnum.INVIGILATE.name())) {
-            userId = tbUser.getId();
+            return null;
+        } else {
+            TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
+            AuthDto authDto = (AuthDto) redisUtil.get(SystemConstant.userOauth + "::" + tbUser.getId());
+            //如果有监考员角色，只能查看自己所监考的考场，巡考员和管理员则可以查看全部考场
+            Long userId = null;
+            if (authDto.getRoleCodes().toString().contains(RoleEnum.INVIGILATE.name())) {
+                userId = tbUser.getId();
+            }
+            return ResultUtil.ok(tOeExamRecordService.invigilatePageProgressList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, courseCode, name, identity, userId, tbUser.getOrgId()));
         }
-        return ResultUtil.ok(tOeExamRecordService.invigilatePageProgressList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, courseCode, name, identity, userId, tbUser.getOrgId()));
     }
 
     @ApiOperation(value = "进度查询列表导出接口")