Merge branch 'feature/0529-live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -1901,7 +1901,11 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             if (Objects.isNull(courseSchedule)) {
                 return userInfo;
             }
-            courseShareService.createPaymentRecord(courseSchedule.getId(),userId);
+            try {
+                courseShareService.createPaymentRecord(courseSchedule.getId(),userId);
+            } catch (Exception e) {
+                log.error("getLiveRoomUserInfo>>>> createPaymentRecord error", e);
+            }
         }
 
         return userInfo;

mec-biz/src/main/resources/config/mybatis/CourseShareMapper.xml

@@ -113,7 +113,7 @@
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
         LEFT JOIN organization o ON o.id_ = su.organ_id_
         LEFT JOIN `subject` sb ON sb.id_ = s.subject_id_list_
-        LEFT JOIN cooperation_organ co on co.organ_id_ = o.id_
+        LEFT JOIN cooperation_organ co on co.id_ = s.cooperation_organ_id_
         <choose>
             <when test="param.teamIds != null and param.teamIds.trim != ''">
                 INNER JOIN

mec-web/src/main/java/com/ym/mec/web/controller/CourseShareController.java

@@ -53,7 +53,7 @@ public class CourseShareController extends BaseController {
         return succeed(courseShareService.queryCourseSharedStudent(shareQueryInfo));
     }
 
-    @ApiOperation(value = "查询已经分享过的学生")
+    @ApiOperation(value = "查询可以分享的学生列表")
     @GetMapping("/queryAllCourseShareStudent")
     @PreAuthorize("@pcs.hasPermissions('courseShare/queryAllCourseShareStudent')")
     public HttpResponseResult<PageInfo<StudentManageListDto>> queryAllCourseShareStudent(