diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java index 5e618ba6..9e02f0c4 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java @@ -186,8 +186,8 @@ public class ResourcesApplicationService extends CoreBaseService noticeList = teacherOpenCourseNoticeService.getValues(teacherOpenCourseNoticeQuery); - // 教师应用信息 - TeacherMergeApplicationQuery teacherMergeApplicationQuery = new TeacherMergeApplicationQuery(); - teacherMergeApplicationQuery.setTeacherId(teacherId); - List applicationList = teacherMergeApplicationDao.getValuesByQueryOrderByIndex(teacherMergeApplicationQuery); - // 我的应用由来:教师所在的院校,查询关联到的应用 - List resourcesApplicationList = resourcesApplicationService - .getResourcesApplicationListByUniversitiesCollegesId(teacherExtendSchoolInfo.getUniversitiesCollegesId()); + ResourcesApplicationQuery resourcesApplicationQuery = new ResourcesApplicationQuery(); + PageQuery pageQuery = resourcesApplicationQuery.getPageQuery(); + + resourcesApplicationQuery.setTeacherId(teacherId); + PageQuery resourcesApplicationPageQuery = resourcesApplicationService.queryMyApplicationByConditionQuery(pageQuery); + List resourcesApplications = CollectionUtil.emptyIfNull(resourcesApplicationPageQuery.getList()); // 我的开课信息 TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery = new TeacherOpenCourseMergeTeacherQuery(); @@ -85,7 +84,7 @@ public class ApiTeacherService { return TeacherIndexData.builder() .toDoList(reportList) .noticeList(noticeList) - .myApplicationList(resourcesApplicationList) + .myApplicationList(resourcesApplications) .myOpenCourseList(openCourseList) .build(); }