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

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

@@ -367,10 +367,10 @@
     <!-- 获取乐团未分班的学生 -->
     <select id="findMusicGroupNoClassGroupStudent" resultMap="StudentRegistration">
         SELECT * FROM student_registration WHERE music_group_id_ = #{musicGroupId}
-        <if test="actualSubjectId != null and actualSubjectId !=''">
+        <if test="actualSubjectId != null">
             AND actual_subject_id_ = #{actualSubjectId}
         </if>
-        AND payment_status_ = 2 AND class_group_id_ IS NULL
+        AND payment_status_ = 2 AND class_group_id_ =0
     </select>
 
 
@@ -379,10 +379,10 @@
         SELECT sr.*,cg.name_ class_group_name_ FROM student_registration sr
         LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
         WHERE sr.music_group_id_ = #{musicGroupId}
-        <if test="actualSubjectId != null and actualSubjectId !=''">
+        <if test="actualSubjectId != null">
             AND sr.actual_subject_id_ = #{actualSubjectId}
         </if>
-        AND payment_status_ = 1;
+        AND payment_status_ = 2;
     </select>
 
     <!-- 根据注册id list查询报名学生的信息 -->

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

@@ -1,5 +1,6 @@
 package com.ym.mec.teacher.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
@@ -59,6 +60,7 @@ public class TeacherCourseScheduleController extends BaseController {
         if(null==user){
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
+        System.out.println(JSON.toJSONString(user));
         List<CourseScheduleDto> teacherCourseSchedulesWithDate = scheduleService.getTeacherCourseSchedulesWithDate(user.getId(),date,type);
         Map<String,Object> result = new HashMap<>();
         result.put("rows",teacherCourseSchedulesWithDate);