Merge branch 'dev_v1.1.3' into release_v1.1.3

merge

themis-admin/src/main/java/com/qmth/themis/admin/api/SysController.java

@@ -396,8 +396,13 @@ public class SysController {
     @RequestMapping(value = "/exam/finish/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "角色信息", response = TEExamQueryDto.class)})
     public Result examFinishQuery() {
+        TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         QueryWrapper<TEExam> teExamQueryWrapper = new QueryWrapper<>();
-        teExamQueryWrapper.lambda().eq(TEExam::getMonitorStatus, InvigilateMonitorStatusEnum.FINISHED);
+        teExamQueryWrapper.lambda().eq(TEExam::getMonitorStatus, InvigilateMonitorStatusEnum.FINISHED)
+                .eq(TEExam::getEnable, 1);
+        if (Objects.nonNull(tbUser)) {
+            teExamQueryWrapper.lambda().eq(TEExam::getOrgId, tbUser.getOrgId());
+        }
         List<TEExam> teExamList = teExamService.list(teExamQueryWrapper);
         List<TEExamQueryDto> teExamQueryDtoList = null;
         if (!CollectionUtils.isEmpty(teExamList)) {