Merge branch 'teacher_vip_salary' of http://git.dayaedu.com/yonge/mec into test

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

@@ -508,7 +508,9 @@
         GROUP BY cssp.id_
         ORDER BY
         <if test="courseScheduleId != null and orderFlag == 1">
-            status_ DESC,visitFlag,
+            <if test="courseScheduleId != null or (search != null and search != '')">
+                status_ DESC,visitFlag,
+            </if>
         </if>
         CONCAT(cs.class_date_, ' ', cs.start_class_time_) ASC
         <include refid="global.limit"/>