Merge remote-tracking branch 'origin/master'

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

@@ -424,13 +424,14 @@
 	</select>
 
 	<select id="countLessThenThreeClassGroupNum" resultType="int">
-		SELECT
-			COUNT(DISTINCT cg.id_)
-		FROM
+		SELECT COUNT(*) FROM (
+			SELECT
+			DISTINCT cg.id_
+			FROM
 			class_group cg
 			LEFT JOIN class_group_student_mapper cgsm ON cg.id_ = cgsm.class_group_id_
 			LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-		WHERE
+			WHERE
 			cg.type_ = 'HIGH'
 			AND mg.status_ = 'PROGRESS'
 			AND cgsm.status_ = 'NORMAL'
@@ -440,10 +441,11 @@
 					#{organId}
 				</foreach>
 			</if>
-		GROUP BY
-			cg.music_group_id_
-		HAVING
+			GROUP BY
+			cg.id_
+			HAVING
 			COUNT( DISTINCT cgsm.user_id_ )&lt;3
+		)
 	</select>
 
     <select id="getLessThenThreeMusicGroup" resultType="java.lang.String">
@@ -464,7 +466,7 @@
 				</foreach>
 			</if>
 		GROUP BY
-			cg.music_group_id_
+			cg.id_
 		HAVING
 			COUNT( DISTINCT cgsm.user_id_ )&lt;3
 	</select>