Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -1355,6 +1355,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND u.realname  like concat('%', #{userName}, '%')
             ) >0
         </if>
+          AND  g.status != -1
         <if test="classStatus != null and  classStatus==0">
             AND (g.class_status =  #{classStatus} or g.class_status  is null )
         </if>
@@ -1426,6 +1427,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_business cb ON d.business_id = cb.id
         WHERE
         1 = 1
+        AND  g.status != -1
         <if test="status != null and status.size()!=0 ">
             AND g.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">