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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleDao.java

@@ -102,6 +102,8 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
     //学生端-首页-陪练课老师列表
     List<PracticeTeacherVo> teacherList(IPage<PracticeTeacherVo> page, @Param("param") PracticeTeacherSearch search);
 
+    List<Long> teacherIdList();
+
     //学生端-课表-日历-用户
     List<CourseStudent> queryCourseTeacher(@Param("param") MyCourseSearch search);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -782,9 +782,14 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
     @Override
     public IPage<PracticeTeacherVo> teacherList(IPage<PracticeTeacherVo> page, PracticeTeacherSearch search) {
         if (search.getScreen() != null && search.getScreen()) {
-            search.setTeacherIdList(getTeacherId(30));
+            List<Long> teacherIdList = getTeacherId(30);
+            if (CollectionUtils.isEmpty(teacherIdList)){
+                return null;
+            }
+            search.setTeacherIdList(teacherIdList);
             return page.setRecords(baseMapper.teacherList(page, search));
         } else {
+            search.setTeacherIdList(baseMapper.teacherIdList());
             return page.setRecords(baseMapper.teacherList(page, search));
         }
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -398,7 +398,7 @@
         WHERE f.default_flag_=1
         AND p.subject_id_=#{param.subjectId}) sp ON t.user_id_=sp.teacherId
 
-        WHERE t.user_id_ IN (SELECT teacher_id_ FROM teacher_free_time GROUP BY teacher_id_)
+        <where>
         <if test="param.teacherIdList != null and param.teacherIdList.size>0">
             AND t.user_id_ IN
             <foreach collection="param.teacherIdList" item="item" open="(" separator="," close=")">
@@ -416,6 +416,7 @@
                 ORDER BY ${param.sort}
             </when>
         </choose>
+        </where>
     </select>
 
     <select id="queryCourseTeacher" resultType="com.yonge.cooleshow.biz.dal.vo.CourseStudent"
@@ -765,6 +766,9 @@
             WHERE user_id_=(SELECT user_id_ FROM course_schedule_student_payment WHERE course_id_=#{courseId} AND course_type_='PRACTICE')
         )
     </select>
+    <select id="teacherIdList" resultType="java.lang.Long">
+        SELECT teacher_id_ FROM teacher_free_time GROUP BY teacher_id_
+    </select>
     <update id="updateStartTime">
         UPDATE course_schedule SET status_='ING' WHERE status_ != 'CANCEL' <![CDATA[ AND start_time_ <= NOW() ]]> <![CDATA[ AND NOW() <= end_time_ ]]>
     </update>