瀏覽代碼

add:教学课程查询bug

caozixuan 1 年之前
父節點
當前提交
059bcbd888

+ 2 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TeachCourseMapper.java

@@ -26,11 +26,12 @@ public interface TeachCourseMapper extends BaseMapper<TeachCourse> {
      * @param iPage      分页参数
      * @param iPage      分页参数
      * @param examId     考试id
      * @param examId     考试id
      * @param courseName 课程名称
      * @param courseName 课程名称
+     * @param schoolId   学校id
      * @param dpr        数据权限
      * @param dpr        数据权限
      * @return 结果
      * @return 结果
      */
      */
     IPage<TeachCourseResult> findTeachCoursePage(@Param("iPage") Page<TeachCourseResult> iPage,
     IPage<TeachCourseResult> findTeachCoursePage(@Param("iPage") Page<TeachCourseResult> iPage,
-            @Param("examId") Long examId, @Param("courseName") String courseName, @Param("dpr") DataPermissionRule dpr);
+            @Param("examId") Long examId, @Param("courseName") String courseName, @Param("schoolId") Long schoolId, @Param("dpr") DataPermissionRule dpr);
 
 
     /**
     /**
      * 教师团队分页查询
      * 教师团队分页查询

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachCourseServiceImpl.java

@@ -100,7 +100,7 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
 
 
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(requestUser.getSchoolId(),
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(requestUser.getSchoolId(),
                 requestUser.getId(), ServletUtil.getRequest().getServletPath());
                 requestUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.findTeachCoursePage(new Page<>(pageNumber, pageSize), examId, courseName, dpr);
+        return this.baseMapper.findTeachCoursePage(new Page<>(pageNumber, pageSize), examId, courseName, requestUser.getSchoolId(), dpr);
     }
     }
 
 
     @Deprecated
     @Deprecated

+ 3 - 0
distributed-print-business/src/main/resources/mapper/TeachCourseMapper.xml

@@ -19,6 +19,9 @@
                 LEFT JOIN
                 LEFT JOIN
             sys_user su on tc.user_id = su.id
             sys_user su on tc.user_id = su.id
         <where>
         <where>
+            <if test="schoolId != null">
+                AND tc.school_id = #{schoolId}
+            </if>
             <if test="examId != null">
             <if test="examId != null">
                 AND tc.exam_id = #{examId}
                 AND tc.exam_id = #{examId}
             </if>
             </if>