add:课程大纲查询加学校id

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ObeCourseOutlineMapper.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 public interface ObeCourseOutlineMapper extends BaseMapper<ObeCourseOutline> {
 
-    IPage<ObeCourseOutlineResult> findObeCourseOutlinePage(@Param("iPage") Page<ObeCourseOutlineResult> iPage,
+    IPage<ObeCourseOutlineResult> findObeCourseOutlinePage(@Param("iPage") Page<ObeCourseOutlineResult> iPage, @Param("schoolId") Long schoolId,
             @Param("professionalId") Long professionalId, @Param("cultureProgramId") Long cultureProgramId, @Param("courseId") Long courseId,
             @Param("courseOutlineName") String courseOutlineName, @Param("dpr") DataPermissionRule dpr);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ObeCourseOutlineServiceImpl.java

@@ -61,13 +61,14 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
 
     @Override
     public IPage<ObeCourseOutlineResult> findObeCourseOutlinePage(Long professionalId, Long cultureProgramId, Long courseId,
-                                                                  String courseOutlineName, int pageNumber, int pageSize) {
+            String courseOutlineName, int pageNumber, int pageSize) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+        Long schoolId = requestUser.getSchoolId();
         courseOutlineName = SystemConstant.translateSpecificSign(courseOutlineName);
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(requestUser.getSchoolId(),
                 requestUser.getId(), ServletUtil.getRequest().getServletPath());
-        return baseMapper.findObeCourseOutlinePage(new Page<>(pageNumber, pageSize), professionalId, cultureProgramId,
-                courseId, courseOutlineName, dpr);
+        return baseMapper.findObeCourseOutlinePage(new Page<>(pageNumber, pageSize), schoolId, professionalId,
+                cultureProgramId, courseId, courseOutlineName, dpr);
     }
 
     @Override
@@ -82,8 +83,8 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
         Long id = obeCourseOutlineParams.getId();
 
         ObeCourseOutline checkUnique = this.getOne(new QueryWrapper<ObeCourseOutline>().lambda()
-                .eq(ObeCourseOutline::getCultureProgramId, cultureProgramId)
-                .eq(ObeCourseOutline::getCourseId, courseId).last(SystemConstant.LIMIT1));
+                .eq(ObeCourseOutline::getCultureProgramId, cultureProgramId).eq(ObeCourseOutline::getCourseId, courseId)
+                .last(SystemConstant.LIMIT1));
         if (Objects.nonNull(checkUnique)) {
             if (!Objects.equals(checkUnique.getId(), id)) {
                 throw new RuntimeException("该课程已经创建了课程大纲不能重复创建");

distributed-print-business/src/main/resources/mapper/ObeCourseOutlineMapper.xml

@@ -33,6 +33,9 @@
                 LEFT JOIN
             basic_professional bp ON ocp.professional_id = bp.id
         <where>
+            <if test="schoolId != null">
+                AND oco.school_id = #{schoolId}
+            </if>
             <if test="professionalId != null">
                 AND ocp.professional_id = #{professionalId}
             </if>