diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java index e9e4703e..a2e42340 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java @@ -65,7 +65,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllByQuery(universitiesCollegesJurisdictionCurriculumResourcesQuery); } - public List getAllByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery param, Boolean b) { + public List getAllAuthCourseByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery param) { return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseByQuery(param); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java index 9c62d995..7a76d7ab 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java @@ -40,7 +40,6 @@ import java.util.Arrays; import java.util.List; import static cn.hutool.core.util.ArrayUtil.join; -import static com.ibeetl.admin.core.util.StreamUtils.listJoin; import static com.ibeetl.jlw.enums.AddTypeEnum.ADMIN_ADD; import static com.ibeetl.jlw.enums.AddTypeEnum.FACULTY_ADD; @@ -147,8 +146,8 @@ public class ResourcesInfoController{ PageQuery page = condition.getPageQuery(); if (!coreUser.isAdmin()) { - List authCourseList = universitiesCollegesJurisdictionCurriculumResourcesService.getAllAuthCourseInfoByOrgId(coreUser.getOrgId()); - String courseInfoIds = listJoin(authCourseList, CourseInfo::getCourseInfoId); + String courseInfoIds = + universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(coreUser.getOrgId()).getAllAuthCourseInfoIds(); if (StrUtil.isNotBlank(courseInfoIds)) { condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1L, null).toArray(), ",")); diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java index 89d7f5a3..04d654d2 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionCurriculumResourcesController.java @@ -118,7 +118,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesController{ @GetMapping(MODEL + "/getAllByQuery.json") @ResponseBody public JsonResult> getAllAuthCourseByQuery(UniversitiesCollegesJurisdictionCurriculumResourcesQuery param) { - Listlist = universitiesCollegesJurisdictionCurriculumResourcesService.getAllByQuery(param, true); + Listlist = universitiesCollegesJurisdictionCurriculumResourcesService.getAllAuthCourseByQuery(param); return JsonResult.success(list); }