考试代码提交

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/student/TExamController.java

@@ -19,21 +19,19 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.pojo.CommonResult;
-import vip.xiaonuo.common.pojo.CommonValidList;
 import vip.xiaonuo.exam.base.BaseApiController;
 import vip.xiaonuo.exam.domain.TExam;
-import vip.xiaonuo.exam.domain.exam.TExamAddParam;
-import vip.xiaonuo.exam.domain.exam.TExamEditParam;
 import vip.xiaonuo.exam.domain.exam.TExamIdParam;
 import vip.xiaonuo.exam.domain.exam.TExamPageParam;
 import vip.xiaonuo.exam.service.TExamService;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 
 /**
  * 考试表控制器 学生端
@@ -62,11 +60,7 @@ public class TExamController extends BaseApiController {
     @SaCheckPermission("/api/admin/s_exam/page")
     @GetMapping("/page")
     public CommonResult<Page<TExam>> page(TExamPageParam tExamPageParam) {
-        SaBaseLoginUser currentUser = getCurrentUser();
-        if(currentUser == null || currentUser.getAccount() == null){
-            throw new RuntimeException("未登录！！！");
-        }
-        tExamPageParam.setUserId(currentUser.getAccount());
+         tExamPageParam.setUserId(StpLoginUserUtil.getLoginUser().getId());
         return CommonResult.data(tExamService.page(tExamPageParam));
     }
 

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/TExamServiceImpl.java

@@ -14,17 +14,13 @@ package vip.xiaonuo.exam.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.aliyun.oss.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,11 +41,11 @@ import vip.xiaonuo.exam.mapper.CourseChapterPaperMapper;
 import vip.xiaonuo.exam.mapper.TExamMapper;
 import vip.xiaonuo.exam.service.ExamPaperService;
 import vip.xiaonuo.exam.service.TExamService;
+import vip.xiaonuo.exam.utility.DateTimeUtil;
+
 import javax.annotation.Resource;
 import java.util.*;
 
-import vip.xiaonuo.exam.utility.DateTimeUtil;
-
 /**
  * 考试表Service接口实现类
  *
@@ -90,13 +86,8 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
         if(ObjectUtil.isNotEmpty(tExamPageParam.getExamType())) {
             queryWrapper.lambda().eq(TExam::getExamType, tExamPageParam.getExamType());
         }
-        if(ObjectUtil.isNotEmpty(tExamPageParam.getUserId())){
-            queryWrapper.lambda().and(wrapper ->
-                            wrapper.like(TExam::getStudentIds, tExamPageParam.getUserId())
-                                    .or()
-                                    .isNull(TExam::getStudentIds)
-                                    .or()
-                                    .eq(TExam::getStudentIds, ""));
+       if(ObjectUtil.isNotEmpty(tExamPageParam.getUserId())){
+           queryWrapper.lambda().eq(TExam::getCreateUser, tExamPageParam.getUserId());
         }
         if(ObjectUtil.isAllNotEmpty(tExamPageParam.getSortField(), tExamPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(tExamPageParam.getSortOrder());