diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 5633b699..5787a4b5 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -254,22 +254,24 @@ public class CourseServiceImpl implements ICourseService { List filters = createFilters(dto); //有权限的查询,也同时查询出创建人的数据,在权限上 - if(TempFilterConfig.Manager_CourseFile_ByOrgIds && StringUtils.isNotBlank(dto.getOrgAid())) { - if(StringUtil.isNotBlank(dto.getOrgIds())){ - if(dto.getOrgIds().contains(",")){ - String[] split = dto.getOrgIds().split(","); - List strings = Arrays.asList(split); - //filters.add(FieldFilters.in("orgId",strings)); - filters.add(FieldFilters.or(FieldFilters.in("orgId",strings),FieldFilters.eq("sysCreateAid",dto.getOrgAid()))); - }else { - //filters.add(FieldFilters.eq("orgId",dto.getOrgIds())); - filters.add(FieldFilters.or(FieldFilters.eq("orgId",dto.getOrgIds()),FieldFilters.eq("sysCreateAid",dto.getOrgAid()))); - } - }else { - //没有机构权限,只能查出自己创建的 - filters.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); - } - } + + if(TempFilterConfig.Manager_CourseFile_ByOrgIds) { + if(dto.getIsSystemAdmin()==null || !dto.getIsSystemAdmin()) { + + if(StringUtil.isNotBlank(dto.getOrgIds())){ + if(dto.getOrgIds().contains(",")){ + String[] split = dto.getOrgIds().split(","); + List strings = Arrays.asList(split); + filters.add(FieldFilters.or(FieldFilters.in("orgId",strings),FieldFilters.eq("sysCreateAid",dto.getOrgAid()))); + }else { + filters.add(FieldFilters.or(FieldFilters.eq("orgId",dto.getOrgIds()),FieldFilters.eq("sysCreateAid",dto.getOrgAid()))); + } + }else { + //没有机构权限,只能查出自己创建的 + filters.add(FieldFilters.eq("sysCreateAid",dto.getOrgAid())); + } + } + } //自动添加过滤已删除 filters.add(FieldFilters.eq("deleted",false)); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java index 7ce29e03..e495efc3 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java @@ -1,7 +1,6 @@ package com.xboe.school.study.api; import java.io.IOException; -import java.time.LocalDateTime; import java.time.ZoneOffset; import org.apache.commons.lang3.StringUtils; @@ -143,7 +142,6 @@ public class StudyCourseESApi extends ApiBaseController{ } } - return success(true); } }