|
@@ -374,10 +374,8 @@
|
|
|
LEFT JOIN SUBJECT sj ON s.subject_id_list_ = sj.id_
|
|
|
LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
|
|
|
<where>
|
|
|
- cto.status_ = 2 AND tor.order_no_ is not null AND tor.order_type_ = 'CLOUD_TEACHER'
|
|
|
- <if test="musicGroupId != null and musicGroupId != ''">
|
|
|
- AND sr.music_group_id_ = #{musicGroupId}
|
|
|
- </if>
|
|
|
+ cto.status_ = 2 AND tor.order_no_ is not null AND tor.trans_no_ is not null
|
|
|
+ AND tor.order_type_ = 'CLOUD_TEACHER'
|
|
|
<if test="queryCondition != null and queryCondition != ''">
|
|
|
AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
|
|
|
</if>
|
|
@@ -419,10 +417,8 @@
|
|
|
LEFT JOIN subject sj ON s.subject_id_list_ = sj.id_
|
|
|
LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
|
|
|
<where>
|
|
|
- cto.status_ = 2 AND tor.order_no_ is not null AND tor.order_type_ = 'CLOUD_TEACHER'
|
|
|
- <if test="musicGroupId != null and musicGroupId != ''">
|
|
|
- AND sr.music_group_id_ = #{musicGroupId}
|
|
|
- </if>
|
|
|
+ cto.status_ = 2 AND tor.order_no_ is not null AND tor.trans_no_ is not null
|
|
|
+ AND tor.order_type_ = 'CLOUD_TEACHER'
|
|
|
<if test="queryCondition != null and queryCondition != ''">
|
|
|
AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
|
|
|
</if>
|