1.课程全量加入只检索自己创建

2.修复查询试卷回答因调查问卷没有subjectid导致报错

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseInfoController.java

@@ -112,6 +112,14 @@ public class CourseInfoController {
     @GetMapping("/disk/courseinfo/allList")
     public CommonResult<List<CourseInfo>> allList(CourseInfoPageParam courseInfoPageParam, HttpServletRequest req) {
         Map param =new HashMap();
+        //是否是自己创建的课程，0否1是，默认为否
+        String isSelf="0";
+        if(StringUtils.isNotEmpty(req.getParameter("isSelf")))isSelf=req.getParameter("isSelf");
+        param.put("isSelf",isSelf);
+        if("1".equals(isSelf))
+        {
+            param.put("userId", StpLoginUserUtil.getLoginUser().getId());
+        }
         List<CourseInfo> list=courseInfoService.queryCourseInfoList(param);
         return CommonResult.data(list);
     }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CourseInfoServiceImpl.java

@@ -130,6 +130,13 @@ public class CourseInfoServiceImpl extends ServiceImpl<CourseInfoMapper, CourseI
     public List<CourseInfo> queryCourseInfoList(Map param)
     {
         QueryWrapper<CourseInfo> queryWrapper = new QueryWrapper<>();
+        if(ObjectUtil.isNotEmpty( param.get("isSelf")))
+        {
+            if(ObjectUtil.isNotEmpty(param.get("userId")))
+            {
+                queryWrapper.lambda().eq(CourseInfo::getCreateUser, param.get("userId"));
+            }
+        }
         return this.list(queryWrapper);
     }
 

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

@@ -1,6 +1,8 @@
 package vip.xiaonuo.exam.controller.student;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
 import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.exam.base.BaseApiController;
@@ -52,13 +54,16 @@ public class ExamPaperAnswerController extends BaseApiController {
         model.setCreateUser(getCurrentUser().getId());
         Page<ExamPaperAnswer> pageInfo = examPaperAnswerService.studentPage(model);
         pageInfo.getRecords().forEach(vm -> {
-            Subject subject = subjectService.selectById(vm.getSubjectId());
-            vm.setDoTimeStr(ExamUtil.secondToVM(vm.getDoTime()));
-            vm.setSystemScoreStr(ExamUtil.scoreToVM(vm.getSystemScore()));
-            vm.setUserScoreStr(ExamUtil.scoreToVM(vm.getUserScore()));
-            vm.setPaperScoreStr(ExamUtil.scoreToVM(vm.getPaperScore()));
-            vm.setSubjectName(subject.getName());
-            vm.setCreateTimeStr(DateTimeUtil.dateFormat(vm.getCreateTime()));
+            if(ObjectUtil.isNotEmpty(vm.getSubjectId()))
+            {
+                Subject subject = subjectService.selectById(vm.getSubjectId());
+                vm.setDoTimeStr(ExamUtil.secondToVM(vm.getDoTime()));
+                vm.setSystemScoreStr(ExamUtil.scoreToVM(vm.getSystemScore()));
+                vm.setUserScoreStr(ExamUtil.scoreToVM(vm.getUserScore()));
+                vm.setPaperScoreStr(ExamUtil.scoreToVM(vm.getPaperScore()));
+                vm.setSubjectName(subject.getName());
+                vm.setCreateTimeStr(DateTimeUtil.dateFormat(vm.getCreateTime()));
+            }
         });
         return CommonResult.data(pageInfo);
     }