在线学习

web/src/main/java/com/ynfy/app/api/v1/controller/ApiCourseController.java

@@ -68,8 +68,7 @@ public class ApiCourseController extends ApiBaseController {
         courseService.setCategory(pageList);
         if (!CollectionUtils.isEmpty(pageList.getRecords())) {
             List<String> courseIdList = pageList.getRecords().stream().map(Course::getId).collect(Collectors.toList());
-            List<UserCourseStudyVO> studyList = userCourseCatalogService.getUserCourseStudy(courseIdList,
-                    TokenUtil.getUserId(TokenUtil.getToken(request)));
+            List<UserCourseStudyVO> studyList = userCourseCatalogService.getUserCourseStudy(courseIdList, TokenUtil.getUserId(TokenUtil.getToken(request)));
             if (!CollectionUtils.isEmpty(studyList)) {
                 pageList.getRecords().forEach((o) -> courseService.setCourseStudyProcess(studyList, o));
             }
@@ -116,8 +115,7 @@ public class ApiCourseController extends ApiBaseController {
         //获取课程学习进度
         List<String> courseIdList = new ArrayList<>();
         courseIdList.add(course.getId());
-        courseService.setCourseStudyProcess(userCourseCatalogService.getUserCourseStudy(courseIdList,
-                TokenUtil.getUserId(TokenUtil.getToken(request))), course);
+        courseService.setCourseStudyProcess(userCourseCatalogService.getUserCourseStudy(courseIdList, TokenUtil.getUserId(TokenUtil.getToken(request))), course);
 
         return Result.OK(course);
     }
@@ -145,7 +143,7 @@ public class ApiCourseController extends ApiBaseController {
     @ApiOperation(value = "获取课程任务学习进度", notes = "获取课程任务学习进度")
     @GetMapping(value = "/getCourseStudyProcess")
     public Result<?> getCourseStudyProcess(@RequestParam String courseId) {
-        return Result.OK(userCourseCatalogService.getCourseStudyProcess(courseId));
+        return Result.OK(userCourseCatalogService.getCourseStudyProcess(courseId, TokenUtil.getUserId(TokenUtil.getToken(request))));
     }
 
     /**

web/src/main/java/com/ynfy/buss/course/usercoursecatalog/controller/UserCourseCatalogController.java

@@ -185,7 +185,8 @@ public class UserCourseCatalogController extends JeecgController<UserCourseCatal
     @ApiOperation(value = "获取课程任务学习进度", notes = "获取课程任务学习进度")
     @GetMapping(value = "/getCourseStudyProcess")
     public Result<?> getCourseStudyProcess(@RequestParam String courseId) {
-        return Result.OK(userCourseCatalogService.getCourseStudyProcess(courseId));
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        return Result.OK(userCourseCatalogService.getCourseStudyProcess(courseId, user.getId()));
     }
 
     /**
@@ -197,8 +198,8 @@ public class UserCourseCatalogController extends JeecgController<UserCourseCatal
     @ApiOperation(value = "获取任务学习记录", notes = "获取任务学习记录")
     @GetMapping(value = "/findUserCatalog")
     public Result<?> findUserCatalog(@RequestParam String courseCatalogId) {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        return Result.OK(userCourseCatalogService.findUserCatalog(sysUser.getId(), courseCatalogId));
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        return Result.OK(userCourseCatalogService.findUserCatalog(user.getId(), courseCatalogId));
     }
 
 }

web/src/main/java/com/ynfy/buss/course/usercoursecatalog/service/IUserCourseCatalogService.java

@@ -32,7 +32,7 @@ public interface IUserCourseCatalogService extends IService<UserCourseCatalog> {
      *
      * @return
      */
-    List<UserCourseCatalog> getCourseStudyProcess(String courseId);
+    List<UserCourseCatalog> getCourseStudyProcess(String courseId, String userId);
 
 
     /**

web/src/main/java/com/ynfy/buss/course/usercoursecatalog/service/impl/UserCourseCatalogServiceImpl.java

@@ -96,11 +96,11 @@ public class UserCourseCatalogServiceImpl extends ServiceImpl<UserCourseCatalogM
      * @return
      */
     @Override
-    public List<UserCourseCatalog> getCourseStudyProcess(String courseId) {
+    public List<UserCourseCatalog> getCourseStudyProcess(String courseId, String userId) {
         List<CourseCatalog> catalogList = courseCatalogService.listCourseCatalog(courseId);
         List<String> courseCatalogIdList = catalogList.stream().map(CourseCatalog::getId).collect(Collectors.toList());
         LambdaQueryWrapper<UserCourseCatalog> query = new LambdaQueryWrapper<UserCourseCatalog>()
-                .in(UserCourseCatalog::getCourseCatalogId, courseCatalogIdList);
+                .in(UserCourseCatalog::getCourseCatalogId, courseCatalogIdList).eq(UserCourseCatalog::getUserId, userId);
         return list(query);
     }