1、学校端试题管理列表筛选掉未授权得课程

2、学校端筛选掉未授权得课程

web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java

@@ -214,6 +214,7 @@ public class ResourcesQuestionController {
 
         if (coreUser.isUniAdmin()) {
             condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1L).toArray(), ","));
+            condition.setOrgId(coreUser.getOrgId());
             // 查询已经授权的课程ID。
             // 理论课程：授权表universities_colleges_jurisdiction_curriculum_resources，查询理论课程授权给院校的数据
             Serializable courseInfoIds = defaultIfNull(condition.getCourseInfoId(), condition.getCourseInfoIds());

web/src/main/resources/sql/jlw/courseInfo.md

@@ -909,6 +909,7 @@ getCourseSystemOAndUniversities
   @if(!isEmpty(orgId)){
   AND lb.org_id = #orgId#
   AND lb.use_type IN(1,2)
+  AND lb.use_end_time >= NOW()
   @}
   )
   UNION ALL

web/src/main/resources/sql/jlw/resourcesQuestion.md

@@ -582,10 +582,12 @@ getTestItemManageSystemOAndUniversities
   LEFT JOIN course_info aa ON aa.course_info_id = a.course_info_id
   LEFT JOIN course_info ab ON ab.course_info_id = aa.course_info_parent_id
   LEFT JOIN core_org ac ON ac.ID = a.org_id
-  @if(!isEmpty(orgIdPlural)){
-  LEFT JOIN course_label ad ON ad.course_label_id = ab.course_label_id
-  WHERE
-  ad.course_label_type = '理论课程类'
+  @if(!isEmpty(orgId)){
+  LEFT JOIN universities_colleges_jurisdiction_curriculum_resources lb ON lb.course_info_id = ab.course_info_id
+  WHERE 1=1
+  AND lb.org_id = #orgId#
+  AND lb.use_type IN(1,2)
+  AND lb.use_end_time >= NOW()
   @}
   )