Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

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

@@ -240,12 +240,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		checkObjectNull(sysUser, o -> {throw new BizException("请登录");});
 
-		if(musicGroupPaymentBaseCalender.getCalenderActivityList() == null
-				&& musicGroupPaymentBaseCalender.getCalenderMember() == null
-				&& musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList() == null
-				&& musicGroupPaymentBaseCalender.getMusicRepair() == null){
-			throw new BizException("请选择一个缴费项目");
-		}
+//		if(musicGroupPaymentBaseCalender.getCalenderActivityList() == null
+//				&& musicGroupPaymentBaseCalender.getCalenderMember() == null
+//				&& musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList() == null
+//				&& musicGroupPaymentBaseCalender.getMusicRepair() == null){
+//			throw new BizException("请选择一个缴费项目");
+//		}
 		if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS && musicGroup.getStatus() != MusicGroupStatusEnum.PRE_BUILD_FEE) {
 			throw new BizException("创建缴费失败：已存在缴费项目");
 		}

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

@@ -3259,7 +3259,6 @@
             #{item}
         </foreach>
         GROUP BY cs.music_group_id_
-        LIMIT 1
     </select>
     <select id="findNotStartCourseByIds" resultType="java.lang.Long">
         SELECT cs.id_ FROM course_schedule cs WHERE cs.id_ IN

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

@@ -494,7 +494,7 @@
         sr.remark_,
         sr.actual_subject_id_,
         IFNULL(sv.num, 0) visit_num_,
-        sr.has_cloud_teacher_,
+        CASE WHEN st.member_rank_setting_id_ = 1 THEN 1 ELSE 0 END has_cloud_teacher_,
         sr.paying_status_,
         sr.none_need_cloud_teacher_
         FROM student_registration sr