会员试用

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

@@ -242,13 +242,13 @@
 				 LEFT JOIN student s ON t.id_ = s.teacher_id_
 				 LEFT JOIN sys_user su ON su.id_ = s.user_id_
 				 LEFT JOIN sys_music_compare_record mcr ON mcr.user_id_ = s.user_id_
-		WHERE s.teacher_id_ = #{teacherId}
 		<if test="startTime != null and startTime != ''">
 			AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') >= #{startTime} OR mcr.id_ IS NULL)
 		</if>
 		<if test="endTime != null and endTime != ''">
 			AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') &lt; #{endTime} OR mcr.id_ IS NULL)
 		</if>
+		WHERE s.teacher_id_ = #{teacherId}
 		<if test="search != null and search != ''">
 			AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
 		</if>
@@ -275,13 +275,13 @@
 				 LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_ AND mg.status_ = 'PROGRESS'
 				 LEFT JOIN sys_user su ON su.id_ = s.user_id_
 				 LEFT JOIN sys_music_compare_record mcr ON mcr.user_id_ = s.user_id_
-		WHERE s.teacher_id_ = #{teacherId}
 		<if test="startTime != null and startTime != ''">
 			AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') >= #{startTime} OR mcr.id_ IS NULL)
 		</if>
 		<if test="endTime != null and endTime != ''">
 			AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') &lt; #{endTime} OR mcr.id_ IS NULL)
 		</if>
+		WHERE s.teacher_id_ = #{teacherId}
 		<if test="search != null and search != ''">
 			AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
 		</if>