From de1c706fd4947bbd189cb97389972122fbca7b3d Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Mon, 24 Jul 2023 18:47:01 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AD=A6=E6=A0=A1=E7=AB=AF=E8=AF=95?=
 =?UTF-8?q?=E9=A2=98=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=8E=89=E6=9C=AA=E6=8E=88=E6=9D=83=E5=BE=97=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=202=E3=80=81=E5=AD=A6=E6=A0=A1=E7=AB=AF=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=8E=89=E6=9C=AA=E6=8E=88=E6=9D=83=E5=BE=97=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ibeetl/jlw/web/ResourcesQuestionController.java    |  1 +
 web/src/main/resources/sql/jlw/courseInfo.md           |  1 +
 web/src/main/resources/sql/jlw/resourcesQuestion.md    | 10 ++++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
index f3011ea3..d5963c4c 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
+++ b/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());
diff --git a/web/src/main/resources/sql/jlw/courseInfo.md b/web/src/main/resources/sql/jlw/courseInfo.md
index 98eda77e..8d523de8 100644
--- a/web/src/main/resources/sql/jlw/courseInfo.md
+++ b/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
diff --git a/web/src/main/resources/sql/jlw/resourcesQuestion.md b/web/src/main/resources/sql/jlw/resourcesQuestion.md
index e261762d..77eb4a3b 100644
--- a/web/src/main/resources/sql/jlw/resourcesQuestion.md
+++ b/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()
   @}
   )