Merge remote-tracking branch 'origin/master'

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

@@ -139,7 +139,7 @@
         WHERE cg.group_type_ = 'PRACTICE'
           AND pg.buy_months_ >= 1
           AND pg.group_status_ != 'LOCK'
-        GROUP BY pg.organ_id_
+        GROUP BY pg.organ_id_,pg.student_id_
     </select>
 
     <!-- 报告完成数 -->

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

@@ -816,7 +816,7 @@
             #{userId}
         </foreach>
         <if test="search != null and search != ''">
-            AND su.real_name_ LIKE CONCAT('%',#{search},'%')
+            AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
         </if>
         GROUP BY su.id_
     </select>