From 973a04c835c6598c8352fda826bb1e7f67b2e586 Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Tue, 4 Jul 2023 10:02:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=BE=E7=A8=8B=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E3=80=81=E8=AF=95=E9=A2=98=E7=AE=A1=E7=90=86=E7=A6=81=E7=94=A8?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/ibeetl/jlw/web/CourseInfoController.java | 11 ++++++-----
.../ibeetl/jlw/web/ResourcesQuestionController.java | 11 ++++++-----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java
index 55192b12..9ab5d019 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java
@@ -346,11 +346,12 @@ public class CourseInfoController {
condition.setCourseInfoType(1);//类型(1课程 2章 3节)
PageQuery page = condition.getPageQuery();
page.setOrderBy("add_time desc");
- if (coreUser.isAdmin()){
- courseInfoService.getCourseDispositionSystemOAndUniversities(page);
- }else {
- courseInfoService.queryByCondition(page);
- }
+// if (coreUser.isAdmin()){
+// courseInfoService.getCourseDispositionSystemOAndUniversities(page);
+// }else {
+// courseInfoService.queryByCondition(page);
+// }
+ courseInfoService.queryByCondition(page);
return JsonResult.success(page);
}
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 fba020c5..1fe119f4 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
@@ -202,11 +202,12 @@ public class ResourcesQuestionController {
// 如果为空字符串，那么代表这个学校，还没有授权的课程，所以是不会显示任何东西的。
condition.setCourseInfoIds(StrUtil.blankToDefault(ids, "未授权应用"));
}
- if (coreUser.isAdmin()) {
- resourcesQuestionService.getTestItemManageSystemOAndUniversities(page);
- } else {
- resourcesQuestionService.queryByCondition(page);
- }
+// if (coreUser.isAdmin()) {
+// resourcesQuestionService.getTestItemManageSystemOAndUniversities(page);
+// } else {
+// resourcesQuestionService.queryByCondition(page);
+// }
+ resourcesQuestionService.queryByCondition(page);
return JsonResult.success(page);
}