资源列表数据权限

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

@@ -1,6 +1,5 @@
 package com.ibeetl.jlw.dao;
 
-import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.jlw.entity.CourseInfo;
 import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources;
 import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery;
@@ -29,8 +28,8 @@ public interface UniversitiesCollegesJurisdictionCurriculumResourcesDao extends
 
     /**
      * 获取授权的课程列表，根据系统用户
-     * @param coreUser
+     * @param orgId
      * @return
      */
-    List<CourseInfo> getAuthCourseInfo(CoreUser coreUser);
+    List<CourseInfo> getAuthCourseInfoByOrgId(Long orgId);
 }

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

@@ -1,9 +1,11 @@
 package com.ibeetl.jlw.service;
 
 
+import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionCurriculumResourcesDao;
+import com.ibeetl.jlw.entity.CourseInfo;
 import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources;
 import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery;
 import org.beetl.sql.core.SqlId;
@@ -59,5 +61,12 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
         return sqlManager.select(SqlId.of("jlw.universitiesCollegesJurisdictionCurriculumResources.getUniversitiesCollegesJurisdictionCurriculumResourcesValues"),UniversitiesCollegesJurisdictionCurriculumResources.class,paras);
     }
 
+    public List<CourseInfo> getAuthCourseInfoByOrgId(Long orgId){
+        return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(orgId);
+    }
+
+    public List<CourseInfo> getAuthCourseInfoByCoreUser(CoreUser coreUser){
+        return universitiesCollegesJurisdictionCurriculumResourcesDao.getAuthCourseInfoByOrgId(coreUser.getOrgId());
+    }
 
 }

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

@@ -1,6 +1,7 @@
 package com.ibeetl.jlw.web;
 
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.util.ToolUtils;
 import cn.jlw.validate.ValidateConfig;
@@ -15,6 +16,7 @@ import com.ibeetl.jlw.entity.ResourcesInfo;
 import com.ibeetl.jlw.enums.MoveEnum;
 import com.ibeetl.jlw.service.CourseInfoService;
 import com.ibeetl.jlw.service.ResourcesInfoService;
+import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService;
 import com.ibeetl.jlw.web.query.ResourcesInfoQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -38,6 +40,7 @@ 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;
 
@@ -57,6 +60,7 @@ public class ResourcesInfoController{
     @Autowired private ResourcesInfoService resourcesInfoService;
 
     @Autowired private CourseInfoService courseInfoService;
+    @Autowired private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService;
 
     @Autowired
     FileService fileService;
@@ -142,9 +146,14 @@ public class ResourcesInfoController{
     public JsonResult<PageQuery> list(ResourcesInfoQuery condition, @SCoreUser CoreUser coreUser){
         PageQuery page = condition.getPageQuery();
 
-        if (coreUser.isUniAdmin()) {
-            condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1L, null).toArray(), ","));
-//            condition.setCourseInfoIds();
+        if (!coreUser.isAdmin()) {
+            List<CourseInfo> authCourseList = universitiesCollegesJurisdictionCurriculumResourcesService.getAuthCourseInfoByCoreUser(coreUser);
+            String courseInfoIds = listJoin(authCourseList, CourseInfo::getCourseInfoId);
+
+            if (StrUtil.isNotBlank(courseInfoIds)) {
+                condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1L, null).toArray(), ","));
+                condition.setCourseInfoIds(courseInfoIds);
+            }
         }
 
         resourcesInfoService.queryByCondition(page);

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

@@ -206,9 +206,21 @@ getAllByQuery
         and t.universities_colleges_jurisdiction_experimental_system_id =#universitiesCollegesJurisdictionExperimentalSystemId#
       @}
 
-getAuthCourseInfo
+getAuthCourseInfoByOrgId
 ===
 * 获取授权的课程列表，根据系统用户
-  
-  select * from
-  
+
+  SELECT
+  tb.*
+  FROM
+  universities_colleges_jurisdiction_curriculum_resources t
+  INNER JOIN universities_colleges ta ON t.universities_colleges_id = ta.universities_colleges_id
+  AND ta.universities_colleges_status = 1
+  INNER JOIN course_info tb ON tb.course_info_id = t.course_info_id
+  AND tb.course_info_status = 1
+  WHERE
+  1
+  AND now() between t.use_start_time AND t.use_end_time
+  AND t.use_type != 0 AND t.use_type is not null
+  AND ta.org_id = #orgId#
+  order by add_time desc