|
@@ -2522,10 +2522,7 @@
|
|
|
cs.organ_id_,cs.member_flag_,cs.new_course_id_,s.name_ schoole_name_,o.name_ organ_name_,
|
|
|
CASE WHEN COUNT(CASE WHEN sa.id_ IS NULL OR (sa.status_ = 'LEAVE' AND sa.remark_ IS NOT NULL) THEN NULL ELSE 1 END) > 0 THEN 1 ELSE 0 END isCallNames,
|
|
|
CASE WHEN COUNT(CASE WHEN ta.is_complaints_ = 1 THEN 1 ELSE NULL END) > 0 THEN '1' ELSE '0' END is_complaints_,
|
|
|
- (
|
|
|
- select group_concat(csd.id_) from course_schedule csd
|
|
|
- where csd.del_flag_ = 0 and csd.id_ != csd.new_course_id_ and csd.new_course_id_ = cs.new_course_id_
|
|
|
- ) as merged_course_ids_,GROUP_CONCAT(distinct CASE WHEN csts.teacher_role_ = 'TEACHING' THEN csts.user_id_ END) teachingTeacherIds
|
|
|
+ GROUP_CONCAT(distinct CASE WHEN csts.teacher_role_ = 'TEACHING' THEN csts.user_id_ END) teachingTeacherIds
|
|
|
FROM
|
|
|
course_schedule cs
|
|
|
LEFT JOIN school s ON cs.schoole_id_=s.id_
|