通过应用ID查询，理论课程类的课程

web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java

@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.dao;
 
+import com.ibeetl.jlw.entity.CourseInfo;
 import com.ibeetl.jlw.entity.ResourcesApplicationCourse;
 import com.ibeetl.jlw.web.query.ResourcesApplicationCourseQuery;
 import org.beetl.sql.core.engine.PageQuery;
@@ -8,6 +9,7 @@ import org.beetl.sql.mapper.annotation.SqlResource;
 import org.beetl.sql.mapper.annotation.Update;
 import org.springframework.stereotype.Repository;
 
+import javax.annotation.Nullable;
 import java.util.List;
 
 /**
@@ -26,4 +28,12 @@ public interface ResourcesApplicationCourseDao extends BaseMapper<ResourcesAppli
     List<ResourcesApplicationCourse> getByIds(String ids);
     List<ResourcesApplicationCourse> getValuesByQuery(ResourcesApplicationCourseQuery resourcesApplicationCourseQuery);
     List<ResourcesApplicationCourse> getValuesByQueryNotWithPermission(ResourcesApplicationCourseQuery resourcesApplicationCourseQuery);
+
+    /**
+     * 通过应用ID查询，理论课程类的课程
+     * @param applicationIds            应用ID不能为空
+     * @param universitiesCollegesId    院校ID 可为空
+     * @return
+     */
+    List<CourseInfo> getAllByApplicationIds(String applicationIds, @Nullable Long universitiesCollegesId);
 }

web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationCourseService.java

@@ -8,6 +8,7 @@ import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.ResourcesApplicationCourseDao;
+import com.ibeetl.jlw.entity.CourseInfo;
 import com.ibeetl.jlw.entity.ResourcesApplicationCourse;
 import com.ibeetl.jlw.web.query.ResourcesApplicationCourseQuery;
 import org.apache.commons.lang3.StringUtils;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -148,4 +150,13 @@ public class ResourcesApplicationCourseService extends CoreBaseService<Resources
         }
     }
 
+    /**
+     * 通过应用ID查询，理论课程类的课程
+     * @param applicationIds            应用ID不能为空
+     * @param universitiesCollegesId    院校ID 可为空
+     * @return
+     */
+    public List<CourseInfo> getAllByApplicationIds(String applicationIds, @Nullable Long universitiesCollegesId) {
+        return resourcesApplicationCourseDao.getAllByApplicationIds(applicationIds, universitiesCollegesId);
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/ResourcesApplicationCourseController.java

@@ -10,6 +10,7 @@ import com.ibeetl.jlw.entity.CourseInfo;
 import com.ibeetl.jlw.entity.ResourcesApplicationCourse;
 import com.ibeetl.jlw.service.CourseInfoService;
 import com.ibeetl.jlw.service.ResourcesApplicationCourseService;
+import com.ibeetl.jlw.service.UniversitiesCollegesService;
 import com.ibeetl.jlw.web.query.ResourcesApplicationCourseQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -42,6 +43,7 @@ public class ResourcesApplicationCourseController{
 
     @Autowired private ResourcesApplicationCourseService resourcesApplicationCourseService;
     @Autowired private CourseInfoService courseInfoService;
+    @Autowired private UniversitiesCollegesService universitiesCollegesService;
 
     @Autowired FileService fileService;
 
@@ -212,5 +214,17 @@ public class ResourcesApplicationCourseController{
         return JsonResult.success();
     }
 
+    /**
+     * 通过应用ID查询，理论课程类的课程
+     * @param applicationIds            应用ID不能为空
+     * @param universitiesCollegesId    院校ID 可为空
+     * @return
+     */
+    @GetMapping(MODEL + "/getAllByApplicationIds.json")
+    @ResponseBody
+    public JsonResult<List<CourseInfo>> getAllByApplicationIds(String applicationIds, Long universitiesCollegesId) {
+        List<CourseInfo> list = resourcesApplicationCourseService.getAllByApplicationIds(applicationIds, universitiesCollegesId);
+        return  JsonResult.success(list);
+    }
 
 }

web/src/main/java/com/ibeetl/jlw/web/StudentController.java

@@ -2124,7 +2124,13 @@ public class StudentController extends BaseController{
 
         condition.setStudentStatus(1);
 
-        PageQuery<Student> pageQuery = studentService.queryByCondition(condition.getPageQuery());
+        if (!coreUser.isAdmin()) {
+            condition.setOrgId(coreUser.getOrgId());
+        }
+
+        PageQuery page = condition.getPageQuery();
+        page.setPageNumber(1); page.setPageSize(Integer.MAX_VALUE);
+        PageQuery<Student> pageQuery = studentService.queryByCondition(page);
 
         List<Student> list = pageQuery.getList();
 

web/src/main/java/com/ibeetl/jlw/web/TeacherController.java

@@ -1373,9 +1373,16 @@ public class TeacherController extends BaseController {
 
         Assert.isFalse(coreUser.isStudent(), "学生无法访问改接口！");
 
+        if (!coreUser.isAdmin()) {
+            condition.setOrgId(coreUser.getOrgId());
+        }
+
         condition.setTeacherStatus(1);
 
-        PageQuery<Teacher> pageQuery = teacherService.queryByCondition(condition.getPageQuery());
+        PageQuery page = condition.getPageQuery();
+        page.setPageNumber(1); page.setPageSize(Integer.MAX_VALUE);
+
+        PageQuery<Teacher> pageQuery = teacherService.queryByCondition(page);
 
         List<Teacher> list = pageQuery.getList();
 

web/src/main/resources/sql/jlw/resourcesApplicationCourse.md

@@ -177,5 +177,33 @@ getValuesByQueryNotWithPermission
   and find_in_set(t.course_info_id,#courseInfoIdPlural#)
   @}
 
+getAllByApplicationIds
+===
 
-
+* 通过应用ID查询，理论课程类的课程
+
+  SELECT
+  t.course_info_name, t.course_info_id,
+  b.universities_colleges_jurisdiction_curriculum_resources_id,
+  b.universities_colleges_id,
+  b.universities_colleges_jurisdiction_experimental_system_id,
+  b.use_type,
+  b.use_start_time,
+  b.use_end_time,
+  b.second_level_name,
+  b.second_level_logo,
+  b.add_time
+  FROM course_info t
+  INNER JOIN resources_application_course c on c.course_info_id = t.course_info_id
+  LEFT JOIN course_label a ON a.course_label_id = t.course_label_id
+  LEFT JOIN universities_colleges_jurisdiction_curriculum_resources b ON b.course_info_id = t.course_info_id
+  @// 查询指定院校的数据，否则设置-1 谁也不查
+  @if(!isEmpty(universitiesCollegesId)){
+  and b.universities_colleges_id =#universitiesCollegesId#
+  @} else {
+  and b.universities_colleges_id = -1
+  @}
+  @if(!isEmpty(applicationIds)){
+  and find_in_set(c.resources_application_id, #applicationIds#)
+  @}
+  WHERE a.course_label_type = '理论课程类' AND t.course_info_status = 1 AND t.course_info_type = 1