fix bug

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/mapper/TRExamStudentMapper.java

@@ -23,5 +23,5 @@ public interface TRExamStudentMapper extends BaseMapper<TRExamStudent> {
 
     List<StudentCourseInfoDto> listStudentCourseByCultureProgramIdAndStudentCodeAndSemesterId(@Param("cultureProgramId") Long cultureProgramId, @Param("studentCode") String studentCode, @Param("semesterId") Long semesterId);
 
-    IPage<StudentRequirementInfoDto> requirementStudentPage(@Param("studentRequirementInfoDtoPage") Page<StudentRequirementInfoDto> studentRequirementInfoDtoPage, @Param("cultureProgramId") Long cultureProgramId, @Param("studentCodeOrName") String studentCodeOrName, @Param("dpr") DataPermissionRule dpr);
+    IPage<StudentRequirementInfoDto> requirementStudentPage(@Param("studentRequirementInfoDtoPage") Page<StudentRequirementInfoDto> studentRequirementInfoDtoPage, @Param("schoolId") Long schoolId, @Param("cultureProgramId") Long cultureProgramId, @Param("studentCodeOrName") String studentCodeOrName, @Param("dpr") DataPermissionRule dpr);
 }

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/TRExamStudentServiceImpl.java

@@ -335,7 +335,7 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
     public IPage<StudentRequirementInfoDto> getRequirementsStudentPage(Long cultureProgramId, String studentCodeOrName, Integer pageNumber, Integer pageSize) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(requestUser.getSchoolId(), requestUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.requirementStudentPage(new Page<>(pageNumber, pageSize), cultureProgramId, studentCodeOrName, dpr);
+        return this.baseMapper.requirementStudentPage(new Page<>(pageNumber, pageSize), requestUser.getSchoolId(), cultureProgramId, studentCodeOrName, dpr);
     }
 
 //    /**

teachcloud-obe/src/main/resources/mapper/ObeCourseRequirementReportMapper.xml

@@ -32,5 +32,6 @@
                 </if>
             </if>
         </where>
+        ORDER BY ocp.create_time DESC
     </select>
 </mapper>

teachcloud-obe/src/main/resources/mapper/TRExamStudentMapper.xml

@@ -38,11 +38,14 @@
             bes.major_name majorName
         FROM
             (select * from t_r_exam_student where student_code not in ('目标分','平均分','各课程目标平均分')) res
-                LEFT JOIN
-            t_r_basic_info rbi ON res.r_basic_info_id = rbi.id
+            LEFT JOIN t_r_basic_info rbi ON res.r_basic_info_id = rbi.id
             left join basic_exam_student bes on rbi.exam_id = bes.exam_id and rbi.paper_number = bes.paper_number and res.student_code = bes.student_code
             left join basic_course bc on rbi.course_id = bc.id
-            where rbi.culture_program_id = #{cultureProgramId}
+            <where>
+                    bes.school_id = #{schoolId}
+                <if test="cultureProgramId != null and cultureProgramId != ''">
+                    and rbi.culture_program_id = #{cultureProgramId}
+                </if>
                 <if test="studentCodeOrName != null and studentCodeOrName != ''">
                     AND (res.name LIKE CONCAT('%', #{studentCodeOrName}, '%')
                     OR res.student_code LIKE CONCAT('%', #{studentCodeOrName}, '%'))
@@ -61,5 +64,8 @@
                         </foreach>
                     </if>
                 </if>
+                and rbi.culture_program_id is not null
+            </where>
+        order by res.student_code desc
     </select>
 </mapper>