From 3d8c6ae17467d4ec109f2dec4e4ec4e0b7cb8c29 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 22 Feb 2023 22:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=A2=E6=A0=A1=E7=94=A8=E6=88=B7=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ibeetl/jlw/web/TeacherController.java |  5 ++-
 web/src/main/resources/sql/jlw/courseInfo.md  |  2 +-
 .../resources/sql/jlw/universitiesColleges.md | 36 ++++++++++++-------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java
index c5369fcd..6b697a19 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java
@@ -1007,7 +1007,10 @@ public class TeacherController extends BaseController {
         if(null == condition.getTeacherStatus() &&  StringUtils.isBlank(condition.getTeacherStatuses())){
             condition.setTeacherStatus(1);
         }
-        condition.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?coreUser.getOrgId():null);
+
+        if (!coreUser.isAdmin()) {
+            condition.setOrgId(coreUser.getOrgId());
+        }
 
         PageQuery page = condition.getPageQuery();
         teacherService.queryByCondition(page);
diff --git a/web/src/main/resources/sql/jlw/courseInfo.md b/web/src/main/resources/sql/jlw/courseInfo.md
index da75045a..ecbf31ff 100644
--- a/web/src/main/resources/sql/jlw/courseInfo.md
+++ b/web/src/main/resources/sql/jlw/courseInfo.md
@@ -693,7 +693,7 @@ getCourseInfoPageByUniversitiesCollegesId
     INNER JOIN universities_colleges_jurisdiction_experimental_system tc ON tc.type_id = tb.resources_application_id
     WHERE
     1 = 1
-    AND tc.type = 1
+    AND tc.type != 0
     @if(isNotEmpty(universitiesCollegesId)) {
       AND tc.universities_colleges_id = #universitiesCollegesId#
     @}
diff --git a/web/src/main/resources/sql/jlw/universitiesColleges.md b/web/src/main/resources/sql/jlw/universitiesColleges.md
index db88bf74..e0ac9a55 100644
--- a/web/src/main/resources/sql/jlw/universitiesColleges.md
+++ b/web/src/main/resources/sql/jlw/universitiesColleges.md
@@ -241,18 +241,30 @@ getUniversitiesCollegesRuleInfoByOrgId
 * 通过用户组织ID获取院校的的权限信息
 
   SELECT
-  ( SELECT count( 1 ) FROM teacher_open_course t WHERE t.teacher_open_course_status = 1 AND t.org_id = #orgId# ) AS course_info_count,
-  @//(
-  @//SELECT
-  @//count( 1 )
-  @//FROM
-  @//universities_colleges_jurisdiction_experimental_system t
-  @//WHERE
-  @//t.type = 1
-  @//AND t.org_id IN ( SELECT max( universities_colleges_id ) FROM universities_colleges WHERE org_id = #orgId# )) AS application_count,
-  (select count(1) from resources_application t) as application_count,
-  ( SELECT count( 1 ) FROM teacher_open_course_merge_teacher t WHERE t.teacher_open_course_merge_teacher_status = 1 AND t.org_id = #orgId# ) AS teacher_count,
-  ( SELECT count( 1 ) FROM teacher_open_course_merge_student t WHERE t.teacher_open_course_school_class_merge_student_status = 1 AND t.org_id = #orgId# ) AS student_count
+  (
+  SELECT
+  count( 1 )
+  FROM
+  universities_colleges_jurisdiction_curriculum_resources t
+  inner join course_info ta on ta.course_info_id = t.course_info_id
+  WHERE
+  t.use_type != 0
+  AND t.universities_colleges_id = z.universities_colleges_id
+  and now() between t.use_start_time and t.use_end_time ) AS course_info_count,
+  (
+  SELECT
+  count( 1 )
+  FROM
+  universities_colleges_jurisdiction_experimental_system t
+  WHERE
+  t.type != 0
+  AND t.universities_colleges_id = z.universities_colleges_id
+  and now() between t.use_start_time and t.use_end_time ) AS application_count,
+  ( SELECT count( 1 ) FROM teacher t WHERE t.teacher_status = 1 AND t.org_id = z.org_id ) AS teacher_count,
+  ( SELECT count( 1 ) FROM student t WHERE t.student_status = 1 AND t.org_id = z.org_id ) AS student_count
+  from (
+  SELECT max( universities_colleges_id ) as universities_colleges_id, org_id FROM universities_colleges WHERE org_id = #orgId#
+ ) z
 
 getAllUniversitiesColleges
 ===