fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -946,12 +946,11 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
 
     @Override
     public HashMap<String, Object> getPlush(ClassGradeUserQueryBo bo) {
-        List<ClassGradeStudentVo> classGradeStudentVos = this.listGrade(bo);
+        List<ClassGradeStudentVo> classGradeStudentVos = this.baseMapper.listGradeAll(bo);
         bo.setPeriodPlush(1);
         Integer plush = this.baseMapper.getPlush(bo);
         HashMap<String, Object> stringObjectHashMap = new HashMap<>();
         stringObjectHashMap.put("plush",plush);
-        bo.setPeriodPlush(0);
         stringObjectHashMap.put("notPlush",classGradeStudentVos.size()-plush);
         return stringObjectHashMap;
     }

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

@@ -620,7 +620,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="periodPlush != null and periodPlush == 0 ">
             AND (cgu.period_plush is NULL or cgu.period_plush=0)
         </if>
-        order by user_info_status desc ,user_status desc ,cgu.id desc
     </select>
 
     <select id="listGradeAll"  parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultMap="ClassGradeStudentVo">