Merge branch 'zx_2022-11-22' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -1206,7 +1206,7 @@
         <result property="trainStudentNum" column="train_student_num_"/>
     </resultMap>
     <select id="cloudTeacherSum" resultMap="CloudTeacherSumDto">
-        select o.name_ organ_name_,COUNT(s.user_id_) normal_num_,COUNT(smcr.user_id_) train_student_num_,
+        select o.name_ organ_name_,COUNT(distinct s.user_id_) normal_num_,COUNT(distinct smcr.user_id_) train_student_num_,
         COUNT(CASE WHEN smcr.train_time_ &lt; 60 THEN 1 END) 'train1',
         COUNT(CASE WHEN smcr.train_time_ >= 60 AND smcr.train_time_ &lt; 120 THEN 1 END) 'train2',
         COUNT(CASE WHEN smcr.train_time_ >= 120 AND smcr.train_time_ &lt; 240 THEN 1 END) 'train3',