Merge remote-tracking branch 'origin/master'

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

@@ -664,6 +664,7 @@
         WHERE
             cg.del_flag_ = 0
             AND cg.lock_flag_ =0
+            AND cgsm.status_='NORMAL'
             AND cgsm.user_id_ IN
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}
@@ -671,5 +672,7 @@
             <if test="teacherId!=null">
                 AND cgtm.user_id_ = #{teacherId}
             </if>
+            AND cg.id_ IS NOT NULL
+        ORDER BY cg.id_ DESC
     </select>
 </mapper>

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

@@ -641,5 +641,7 @@
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}
             </foreach>
+            AND sub.id_ IS NOT NULL
+        ORDER BY sub.id_ DESC
     </select>
 </mapper>

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

@@ -776,6 +776,7 @@
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}
             </foreach>
+        ORDER BY mg.create_time_ DESC
     </select>
     <!-- 批量删除信息 -->
     <delete id="batchDelete">