|
@@ -583,7 +583,7 @@
|
|
|
AND cs.group_type_ = #{type}
|
|
|
</if>
|
|
|
<if test="search != null and search != ''">
|
|
|
- AND (cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%'))
|
|
|
+ AND (cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%') OR su.real_name_ LIKE CONCAT('%',#{search},'%'))
|
|
|
</if>
|
|
|
<if test="musicGroupId!=null">
|
|
|
AND cs.music_group_id_=#{musicGroupId} AND cs.group_type_='MUSIC'
|
|
@@ -598,6 +598,7 @@
|
|
|
|
|
|
<select id="countCourseSchedulesWithDate" resultType="int">
|
|
|
SELECT count(*) FROM course_schedule cs
|
|
|
+ LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
|
|
|
<if test="classGroupIds != null and organIdList!=null">
|
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
|
</if>
|
|
@@ -623,7 +624,7 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="search != null and search != ''">
|
|
|
- AND (cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%'))
|
|
|
+ AND (cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%') OR su.real_name_ LIKE CONCAT('%',#{search},'%'))
|
|
|
</if>
|
|
|
<if test="musicGroupId!=null">
|
|
|
AND cs.music_group_id_=#{musicGroupId} AND cs.group_type_='MUSIC'
|