瀏覽代碼

Merge remote-tracking branch 'origin/online1' into online1

zouxuan 4 年之前
父節點
當前提交
3fbd795d1c
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

+ 4 - 2
mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -1126,12 +1126,14 @@
 			COUNT( sr.user_id_ ) num2
 		FROM
 			student_registration sr
-				LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
-				LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_ AND cgsm.status_='NORMAL'
+			LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+			LEFT JOIN `subject` sub ON sr.actual_subject_id_=sub.id_
+			LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_ AND cgsm.status_='NORMAL'
 		WHERE
 			sr.music_group_status_ = 'NORMAL'
 			AND mg.status_ = 'PROGRESS'
 			AND cgsm.id_ IS NULL
+			AND sub.parent_subject_id_!=24
 			<if test="educationUserId != null">
 				AND mg.educational_teacher_id_ = #{educationUserId}
 			</if>