Merge branch '20220914' into master_saas

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

@@ -206,9 +206,6 @@
             <if test="status != null">
                 AND si.status_ = #{status}
             </if>
-            <if test="organId != null">
-                AND si.organ_id_ = #{organId}
-            </if>
             <if test="subjectId != null">
                 AND find_in_set(#{subjectId}, stu.subject_id_list_)
             </if>

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

@@ -1125,7 +1125,7 @@
     </select>
     <select id="countCloudStudyStudentData" resultType="int">
         SELECT
-        COUNT( DISTINCT user_id_ )
+        ifnull(COUNT( DISTINCT t.user_id_ ),0)
         FROM
         ((
         SELECT
@@ -1150,7 +1150,6 @@
         LEFT JOIN sys_user su ON t.user_id_ = su.id_
         LEFT JOIN sys_music_compare_record smcr ON t.user_id_ = smcr.user_id_
         <include refid="queryCloudStudyStudentDataCondition" />
-        group by t.user_id_
     </select>
 
     <select id="getOrganEVipStudentNum" resultType="int">