查询这个学校已经授权的课程。

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

@@ -78,6 +78,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
      * @param orgId
      * @return
      */
+    @Deprecated
     public List<CourseInfo> getAuthCourseInfoByOrgId(Long orgId){
         return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(orgId);
     }
@@ -87,6 +88,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
      * @param orgId
      * @return
      */
+    @Deprecated
     public String getAuthCourseInfoStrByOrgId(Long orgId){
         return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(orgId), CourseInfo::getCourseInfoId);
     }
@@ -96,6 +98,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
      * @param coreUser
      * @return
      */
+    @Deprecated
     public List<CourseInfo> getAuthCourseInfoByCoreUser(CoreUser coreUser){
         return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId());
     }
@@ -105,6 +108,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
      * @param coreUser
      * @return
      */
+    @Deprecated
     public String getAuthCourseInfoStrByCoreUser(CoreUser coreUser){
         return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId()), CourseInfo::getCourseInfoId);
     }
@@ -115,6 +119,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
      * @param coreUser
      * @return
      */
+    @Deprecated
     public String getAllAuthCourseInfoStrByCoreUser(CoreUser coreUser){
         return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(coreUser.getOrgId()), CourseInfo::getCourseInfoId);
     }
@@ -125,6 +130,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
      * @param orgId
      * @return
      */
+    @Deprecated
     public String getAllAuthCourseInfoStrByOrgId(Long orgId){
         return listJoin(universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(orgId), CourseInfo::getCourseInfoId);
     }
@@ -134,6 +140,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
      * @param coreUser
      * @return
      */
+    @Deprecated
     public List<CourseInfo> getAllAuthCourseInfoByCoreUser(CoreUser coreUser){
         return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(coreUser.getOrgId());
     }
@@ -144,6 +151,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
      * @param orgId
      * @return
      */
+    @Deprecated
     public List<CourseInfo> getAllAuthCourseInfoByOrgId(Long orgId){
         return universitiesCollegesJurisdictionCurriculumResourcesDao.getAllAuthCourseInfoByOrgId(orgId);
     }

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

@@ -16,6 +16,7 @@ import com.ibeetl.jlw.entity.FileEntity;
 import com.ibeetl.jlw.entity.ResourcesQuestion;
 import com.ibeetl.jlw.entity.vo.ImportQuestionByWordTemplateResultVO;
 import com.ibeetl.jlw.entity.vo.QuestionTypeCountVO;
+import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO;
 import com.ibeetl.jlw.enums.AddTypeEnum;
 import com.ibeetl.jlw.enums.MatchTypeEnum;
 import com.ibeetl.jlw.enums.QuestionBusinessTypeEnum;
@@ -165,8 +166,9 @@ public class ResourcesQuestionController{
             // 理论课程：授权表universities_colleges_jurisdiction_curriculum_resources，查询理论课程授权给院校的数据
             // 考证类课程：查询，不需要二次授权
             Serializable courseInfoIds = defaultIfNull(condition.getCourseInfoId(), condition.getCourseInfoIds());
-            Serializable ifNullCourseInfoIds = defaultIfNull(courseInfoIds,
-                    universitiesCollegesJurisdictionCurriculumResourcesService.getAllAuthCourseInfoStrByOrgId(coreUser.getOrgId()));
+            ResourcesCourseInfoAuthDetailsVO resourcesCourseInfoAuthDetails =
+                    universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(coreUser.getOrgId());
+            Serializable ifNullCourseInfoIds = defaultIfNull(courseInfoIds, resourcesCourseInfoAuthDetails.getAllAuthCourseInfoIds());
 
             // 如果为空字符串，那么代表这个学校，还没有授权的课程，所以是不会显示任何东西的。
             condition.setCourseInfoIds(StrUtil.blankToDefault(String.valueOf(ifNullCourseInfoIds), "未授权应用"));

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

@@ -1,9 +1,6 @@
 package com.ibeetl.jlw.web;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.validate.ValidateConfig;
@@ -19,7 +16,6 @@ import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO;
 import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService;
 import com.ibeetl.jlw.service.UniversitiesCollegesService;
 import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery;
-import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.engine.PageQuery;
@@ -29,7 +25,6 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -223,28 +218,28 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesController{
         return JsonResult.success();
     }
 
-    /**
-     * 查询该机构下所有授权的课程。包含系统本身可以查看的课程
-     * @param orgId
-     * @param coreUser
-     * @return
-     */
-    @PostMapping(MODEL + "/getAllAuthCourseInfoByOrgId.json")
-    @ResponseBody
-    public JsonResult getAllAuthCourseInfoByOrgId(@RequestParam(required = false) Long orgId, @RequestParam(required = false) Long universitiesCollegesId, String applicationIds, @SCoreUser CoreUser coreUser){
-
-        Assert.isFalse(ObjectUtil.isAllEmpty(orgId, universitiesCollegesId), "orgId（机构ID）或universitiesCollegesId （院校ID）不能同时为空！");
-
-        if (orgId == null) {
-            UniversitiesCollegesQuery universitiesCollegesQuery = new UniversitiesCollegesQuery();
-            universitiesCollegesQuery.setUniversitiesCollegesId(universitiesCollegesId);
-            universitiesCollegesQuery.setUniversitiesCollegesStatus(1);
-            UniversitiesColleges universitiesColleges = CollectionUtil.getFirst(universitiesCollegesService.getValuesByQuery(universitiesCollegesQuery));
-            orgId = universitiesColleges.getOrgId();
-        }
-
-        return JsonResult.success(universitiesCollegesJurisdictionCurriculumResourcesService.getAllAuthCourseInfoStrByOrgId(orgId));
-    }
+//    /**
+//     * 查询该机构下所有授权的课程。包含系统本身可以查看的课程
+//     * @param orgId
+//     * @param coreUser
+//     * @return
+//     */
+//    @PostMapping(MODEL + "/getAllAuthCourseInfoByOrgId.json")
+//    @ResponseBody
+//    public JsonResult getAllAuthCourseInfoByOrgId(@RequestParam(required = false) Long orgId, @RequestParam(required = false) Long universitiesCollegesId, String applicationIds, @SCoreUser CoreUser coreUser){
+//
+//        Assert.isFalse(ObjectUtil.isAllEmpty(orgId, universitiesCollegesId), "orgId（机构ID）或universitiesCollegesId （院校ID）不能同时为空！");
+//
+//        if (orgId == null) {
+//            UniversitiesCollegesQuery universitiesCollegesQuery = new UniversitiesCollegesQuery();
+//            universitiesCollegesQuery.setUniversitiesCollegesId(universitiesCollegesId);
+//            universitiesCollegesQuery.setUniversitiesCollegesStatus(1);
+//            UniversitiesColleges universitiesColleges = CollectionUtil.getFirst(universitiesCollegesService.getValuesByQuery(universitiesCollegesQuery));
+//            orgId = universitiesColleges.getOrgId();
+//        }
+//
+//        return JsonResult.success(universitiesCollegesJurisdictionCurriculumResourcesService.getAllAuthCourseInfoStrByOrgId(orgId));
+//    }
 
     /**
      * 获取所有授权的课程