add:课程大纲选择培养方案学校数据隔离

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

@@ -37,10 +37,11 @@ public interface ObeCourseOutlineMapper extends BaseMapper<ObeCourseOutline> {
     /**
      * 查询可选培养方案
      *
-     * @param dpr 数据权限
+     * @param schoolId 学校id
+     * @param dpr      数据权限
      * @return 可选培养方案
      */
-    List<DictionaryResult> findCanChooseCultureProgram(@Param("dpr") DataPermissionRule dpr);
+    List<DictionaryResult> findCanChooseCultureProgram(@Param("schoolId") Long schoolId, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 查询可选课程

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

@@ -65,8 +65,7 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = requestUser.getSchoolId();
         courseOutlineName = SystemConstant.translateSpecificSign(courseOutlineName);
-        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(requestUser.getSchoolId(),
-                requestUser.getId(), ServletUtil.getRequest().getServletPath());
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission();
         return baseMapper.findObeCourseOutlinePage(new Page<>(pageNumber, pageSize), schoolId, professionalId,
                 cultureProgramId, courseId, courseOutlineName, dpr);
     }
@@ -211,9 +210,9 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
 
     @Override
     public List<DictionaryResult> findCanChooseCultureProgram() {
-        Long privilegeId = ServletUtil.getCurrentPrivilegeId();
-        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(privilegeId);
-        return this.baseMapper.findCanChooseCultureProgram(dpr);
+        Long schoolId = (Long) ServletUtil.getRequestHeaderSchoolId();
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission();
+        return this.baseMapper.findCanChooseCultureProgram(schoolId, dpr);
     }
 
     @Override

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

@@ -87,6 +87,9 @@
                 LEFT JOIN
             sys_user su ON ocp.create_id = su.id
         <where>
+            <if test="schoolId != null">
+                AND ocp.school_id = #{schoolId}
+            </if>
             <if test="dpr != null">
                 <if test="dpr.requestUserId != null">
                     AND ocp.create_id = #{dpr.requestUserId}