|
|
|
@ -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<CourseInfo> 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(), ","));
|
|
|
|
|