获取课程任务学习进度bug

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

@@ -184,7 +184,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()));
     }
 
     /**

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);
     }
 
@@ -117,7 +117,7 @@ public class UserCourseCatalogServiceImpl extends ServiceImpl<UserCourseCatalogM
     }
 
     @Override
-    public IPage<UserCourseCatalog> selectPageList(IPage<UserCourseCatalog> page, UserCourseCatalog userCourseCatalog){
+    public IPage<UserCourseCatalog> selectPageList(IPage<UserCourseCatalog> page, UserCourseCatalog userCourseCatalog) {
         return userCourseCatalogMapper.selectPageList(page, userCourseCatalog);
     }
 }