Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx-06-15-live

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

@@ -1876,10 +1876,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if (CollectionUtils.isEmpty(courseSchedules)) {
 			return false;
 		}
-		//直播课不校验冲突
-		if(courseSchedules.get(0).getGroupType() == LIVE){
-			return true;
-		}
 		List<String> classDates = courseSchedules.stream().map(courseSchedule -> DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy-MM-dd"))
 				.collect(Collectors.toList());
 

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

@@ -1913,7 +1913,7 @@
         )
         and cs.tenant_id_ = #{tenantId}
         AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
-        AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.group_type_ != 'LIVE'
+        AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
     </select>
 
     <select id="queryStudentCoursesTimesOfTomorrow" resultMap="Mapper">

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -108,11 +108,14 @@ public class TeacherManageController extends BaseController {
 
     @ApiOperation(value = "根据群编号，获取群组基本信息")
     @GetMapping("/course/findGroupById")
-    public Object findGroupById(Integer groupId){
-        if(null == groupId){
+    public Object findGroupById(String imGroupId){
+        if(null == imGroupId){
             return failed("参数校验错误");
         }
-        return succeed(classGroupService.findGroupById(groupId));
+        if (imGroupId.contains("S") || imGroupId.contains("I")){
+            imGroupId = imGroupId.substring(1);
+        }
+        return succeed(classGroupService.findGroupById(Integer.parseInt(imGroupId)));
     }
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")